diff --git a/navalplanner-webapp/src/main/webapp/users/settings.zul b/navalplanner-webapp/src/main/webapp/users/settings.zul
index 5b00584db..de0436524 100644
--- a/navalplanner-webapp/src/main/webapp/users/settings.zul
+++ b/navalplanner-webapp/src/main/webapp/users/settings.zul
@@ -40,51 +40,56 @@
             </tabs>
             <tabpanels>
                 <tabpanel>
-                    <!-- Data -->
                     <groupbox style="margin-top: 5px" closable="false">
-                        <hbox>
-                            <label value="${i18n:_('Select language:')}" />
+                        <grid fixedLayout="true" id="configurationVariables">
+                            <columns>
+                                <column width="200px" />
+                                <column />
+                            </columns>
+                            <rows>
+                                <row>
+                                    <label value="${i18n:_('Select language:')}" />
 
-                            <listbox id="applicationLanguage"
-                                    model="@{settingsController.languages}"
-                                    itemRenderer="@{settingsController.languagesRenderer}"
-                                    selectedItem="@{settingsController.selectedLanguage}"
-                                    mold="select" />
-                        </hbox>
-                        <separator/>
-                        <hbox>
-                            <label
-                                value="${i18n:_('Planning charts expanded')}" />
-                            <grid>
-                                <columns>
-                                    <column />
-                                    <column />
-                                    <column />
-                                </columns>
-                                <rows>
-                                    <row>
-                                        <checkbox id="expandCompanyPlanningViewCharts"
-                                            label="${i18n:_('Company view')}"
-                                            checked="@{settingsController.expandCompanyPlanningViewCharts}"/>
-                                        <checkbox id="expandOrderPlanningViewCharts"
-                                            label="${i18n:_('Project view')}"
-                                            checked="@{settingsController.expandOrderPlanningViewCharts}"/>
-                                        <checkbox id="expandResourceLoadViewCharts"
-                                            label="${i18n:_('Resource load view')}"
-                                            checked="@{settingsController.expandResourceLoadViewCharts}"/>
-                                    </row>
-                                </rows>
-                            </grid>
-                        </hbox>
-
-                        <hbox>
-                            <button label="${i18n:_('Save')}"
-                                sclass="save-button global-action"
-                                onClick="settingsController.save()" />
-                        </hbox>
+                                    <listbox id="applicationLanguage"
+                                            model="@{settingsController.languages}"
+                                            itemRenderer="@{settingsController.languagesRenderer}"
+                                            selectedItem="@{settingsController.selectedLanguage}"
+                                            mold="select" />
+                                </row>
+                                <row>
+                                    <label
+                                        value="${i18n:_('Planning charts expanded')}" />
+                                    <grid>
+                                        <columns>
+                                            <column />
+                                            <column />
+                                            <column />
+                                        </columns>
+                                        <rows>
+                                            <row>
+                                                <checkbox id="expandCompanyPlanningViewCharts"
+                                                    label="${i18n:_('Company view')}"
+                                                    checked="@{settingsController.expandCompanyPlanningViewCharts}"/>
+                                                <checkbox id="expandOrderPlanningViewCharts"
+                                                    label="${i18n:_('Project view')}"
+                                                    checked="@{settingsController.expandOrderPlanningViewCharts}"/>
+                                                <checkbox id="expandResourceLoadViewCharts"
+                                                    label="${i18n:_('Resource load view')}"
+                                                    checked="@{settingsController.expandResourceLoadViewCharts}"/>
+                                            </row>
+                                        </rows>
+                                    </grid>
+                                </row>
+                            </rows>
+                        </grid>
                     </groupbox>
                 </tabpanel>
             </tabpanels>
         </tabbox>
+        <hbox>
+            <button label="${i18n:_('Save')}"
+                sclass="save-button global-action"
+                onClick="settingsController.save()" />
+        </hbox>
     </window>
 </zk>