diff --git a/Kieker.WebGUI/src/main/webapp/dialogs/settingsDialog.xhtml b/Kieker.WebGUI/src/main/webapp/dialogs/settingsDialog.xhtml
index 168b95e4d2e6a7c0593d44f00272268e3f7020d6..d4e468f4ab29223f906284049643029f8fcf16b1 100644
--- a/Kieker.WebGUI/src/main/webapp/dialogs/settingsDialog.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/dialogs/settingsDialog.xhtml
@@ -8,19 +8,43 @@
     <p:dialog id="settingsDialog" header="Settings" resizable="false"
               modal="true" widgetVar="settingsDlg">
         <h:form>
-            <h:panelGrid columns="2" cellpadding="10">
-                <h:outputText value="Look and Feel:" />
-                <p:themeSwitcher value="#{currentThemeBean.theme}"
-                                 style="width:150px" effect="fade">
-                    <f:selectItem itemLabel="Choose Theme" itemValue="" />
-                    <f:selectItems value="#{themeSwitcherBean.themes}" />
-                </p:themeSwitcher>
-                
-                <h:outputText value="Language:"/>
-                <p:selectOneMenu effectDuration="20" style="width:150px"> 
-                    <f:selectItem itemLabel="English"/>
-                </p:selectOneMenu>
-            </h:panelGrid>
+            <p:tabView>
+                <p:tab title="Common">
+                    <h:panelGrid columns="2" cellpadding="10">
+                        <h:outputText value="Look and Feel:" />
+                        <p:themeSwitcher value="#{currentThemeBean.theme}"
+                                         style="width:150px" effect="fade">
+                            <f:selectItem itemLabel="Choose Theme" itemValue="" />
+                            <f:selectItems value="#{themeSwitcherBean.themes}" />
+                        </p:themeSwitcher>
+
+                        <h:outputText value="Language:"/>
+                        <p:selectOneMenu effectDuration="20" style="width:150px"> 
+                            <f:selectItem itemLabel="English"/>
+                        </p:selectOneMenu>
+                    </h:panelGrid>
+                </p:tab>
+                <p:tab title="Analysis Editor">
+                    <h:panelGrid columns="2" cellpadding="10">
+                        <h:outputText value="Tool Palette"/>
+                        <p:selectOneMenu style="width:150px">
+                            <f:selectItem itemLabel="Lists"/>
+                        </p:selectOneMenu>
+
+                        <h:outputText value="Grid-Size:"/>
+                        <p:spinner style="width:150px"/>
+
+                        <h:outputText value="Grid-Color:"/>
+                        <p:colorPicker style="width:150px"/>
+                    </h:panelGrid>
+                </p:tab>
+                <p:tab title="Analysis Controller" disabled="true">
+                </p:tab>
+                <p:tab title="Cockpit Editor" disabled="true">
+                </p:tab>
+                <p:tab title="Cockpit" disabled="true">
+                </p:tab>
+            </p:tabView>
             <hr/>
             <div style="text-align: right">
                 <p:commandButton value="Ok" oncomplete="settingsDlg.hide();" />