Index: trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java	(revision 4968)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java	(revision 4969)
@@ -43,4 +43,5 @@
 import org.openstreetmap.josm.data.Preferences.StringSetting;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
@@ -50,5 +51,5 @@
 import org.openstreetmap.josm.tools.Utils;
 
-public class AdvancedPreference implements PreferenceSetting {
+public class AdvancedPreference extends DefaultTabPreferenceSetting {
 
     public static class Factory implements PreferenceSettingFactory {
@@ -56,4 +57,13 @@
             return new AdvancedPreference();
         }
+    }
+    
+    private AdvancedPreference() {
+        super("advanced", tr("Advanced Preferences"), tr("Setting Preference entries directly. Use with caution!"));
+    }
+
+    @Override
+    public boolean isExpert() {
+        return true;
     }
 
@@ -118,6 +128,5 @@
 
     public void addGui(final PreferenceTabbedPane gui) {
-        JPanel p = gui.createPreferenceTab("advanced", tr("Advanced Preferences"),
-                tr("Setting Preference entries directly. Use with caution!"), false, true);
+        JPanel p = gui.createPreferenceTab(this);
 
         txtFilter = new JTextField();
Index: trunk/src/org/openstreetmap/josm/gui/preferences/display/DisplayPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/display/DisplayPreference.java	(revision 4969)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/display/DisplayPreference.java	(revision 4969)
@@ -0,0 +1,36 @@
+//License: GPL. Copyright 2007 by Immanuel Scholz and others
+package org.openstreetmap.josm.gui.preferences.display;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import javax.swing.JTabbedPane;
+
+import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
+import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
+import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
+import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
+import org.openstreetmap.josm.tools.GBC;
+
+public class DisplayPreference extends DefaultTabPreferenceSetting {
+    public static class Factory implements PreferenceSettingFactory {
+        public PreferenceSetting createPreferenceSetting() {
+            return new DisplayPreference();
+        }
+    }
+    
+    private DisplayPreference() {
+        super("display", tr("Display Settings"), tr("Various settings that influence the visual representation of the whole program."));
+    }
+    
+    public final JTabbedPane displaycontent = new JTabbedPane();
+    
+    @Override
+    public boolean ok() {
+        return false;
+    }
+
+    @Override
+    public void addGui(PreferenceTabbedPane gui) {
+        gui.createPreferenceTab(this).add(displaycontent, GBC.eol().fill(GBC.BOTH));
+    }
+}
Index: trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java	(revision 4969)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java	(revision 4969)
@@ -0,0 +1,36 @@
+//License: GPL. Copyright 2007 by Immanuel Scholz and others
+package org.openstreetmap.josm.gui.preferences.map;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import javax.swing.JTabbedPane;
+
+import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
+import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
+import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
+import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
+import org.openstreetmap.josm.tools.GBC;
+
+public class MapPreference extends DefaultTabPreferenceSetting {
+    public static class Factory implements PreferenceSettingFactory {
+        public PreferenceSetting createPreferenceSetting() {
+            return new MapPreference();
+        }
+    }
+    
+    private MapPreference() {
+        super("map", tr("Map Settings"), tr("Settings for the map projection and data interpretation."));
+    }
+    
+    public final JTabbedPane mapcontent = new JTabbedPane();
+    
+    @Override
+    public boolean ok() {
+        return false;
+    }
+
+    @Override
+    public void addGui(PreferenceTabbedPane gui) {
+        gui.createPreferenceTab(this).add(mapcontent, GBC.eol().fill(GBC.BOTH));
+    }
+}