diff --git a/diylc/diylc-core/src/org/diylc/components/AbstractSchematicLeadedSymbol.java b/diylc/diylc-core/src/org/diylc/components/AbstractSchematicLeadedSymbol.java
index 1114580a..3e593cf5 100644
--- a/diylc/diylc-core/src/org/diylc/components/AbstractSchematicLeadedSymbol.java
+++ b/diylc/diylc-core/src/org/diylc/components/AbstractSchematicLeadedSymbol.java
@@ -70,7 +70,7 @@ public abstract class AbstractSchematicLeadedSymbol<T> extends AbstractLeadedCom
     }
   }
 
-  @EditableProperty(name = "Label position")
+  @EditableProperty(name = "Label Position")
   public LabelPosition getLabelPosition() {
     return labelPosition;
   }
diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar
index d01d0160..c4e6906a 100644
Binary files a/diylc/diylc-library/lib/diylc-core.jar and b/diylc/diylc-library/lib/diylc-core.jar differ
diff --git a/diylc/diylc-library/src/org/diylc/components/passive/PotentiometerPanel.java b/diylc/diylc-library/src/org/diylc/components/passive/PotentiometerPanel.java
index b9499d39..ff346098 100644
--- a/diylc/diylc-library/src/org/diylc/components/passive/PotentiometerPanel.java
+++ b/diylc/diylc-library/src/org/diylc/components/passive/PotentiometerPanel.java
@@ -405,7 +405,7 @@ public class PotentiometerPanel extends AbstractPotentiometer {
     body = null;
   }
 
-  @EditableProperty(name = "Lug size")
+  @EditableProperty(name = "Lug Size")
   public Size getLugDiameter() {
     return lugDiameter;
   }
@@ -433,7 +433,7 @@ public class PotentiometerPanel extends AbstractPotentiometer {
     this.borderColor = borderColor;
   }
 
-  @EditableProperty(name = "Show shaft")
+  @EditableProperty(name = "Show Shaft")
   public boolean getShowShaft() {
     return showShaft;
   }
diff --git a/diylc/diylc-library/src/org/diylc/components/passive/Resistor.java b/diylc/diylc-library/src/org/diylc/components/passive/Resistor.java
index 3379165e..8a1261c0 100644
--- a/diylc/diylc-library/src/org/diylc/components/passive/Resistor.java
+++ b/diylc/diylc-library/src/org/diylc/components/passive/Resistor.java
@@ -97,7 +97,7 @@ public class Resistor extends AbstractLeadedComponent<Resistance> {
     this.power = power;
   }
 
-  @EditableProperty(name = "Power rating")
+  @EditableProperty(name = "Power Rating")
   public org.diylc.core.measures.Power getPowerNew() {
     return powerNew;
   }
diff --git a/diylc/diylc-library/src/org/diylc/components/passive/ResistorSymbol.java b/diylc/diylc-library/src/org/diylc/components/passive/ResistorSymbol.java
index 63365b57..264b7e44 100644
--- a/diylc/diylc-library/src/org/diylc/components/passive/ResistorSymbol.java
+++ b/diylc/diylc-library/src/org/diylc/components/passive/ResistorSymbol.java
@@ -77,7 +77,7 @@ public class ResistorSymbol extends AbstractSchematicLeadedSymbol<Resistance> {
     this.power = power;
   }
 
-  @EditableProperty(name = "Power rating")
+  @EditableProperty(name = "Power Rating")
   public org.diylc.core.measures.Power getPowerNew() {
     // Backward compatibility
     if (powerNew == null) {
diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar
index d01d0160..c4e6906a 100644
Binary files a/diylc/diylc-swing/lib/diylc-core.jar and b/diylc/diylc-swing/lib/diylc-core.jar differ
diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar
index e86d9b41..55785800 100644
Binary files a/diylc/diylc-swing/library/main.jar and b/diylc/diylc-swing/library/main.jar differ
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentTabbedPane.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentTabbedPane.java
index 689300ae..cdc44c6b 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentTabbedPane.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentTabbedPane.java
@@ -64,13 +64,15 @@ class ComponentTabbedPane extends JTabbedPane {
   public static int SCROLL_STEP = Presenter.ICON_SIZE + ComponentButtonFactory.MARGIN * 2 + 2;
 
   private final IPlugInPort plugInPort;
-  private Container recentToolbar;
+  private Container recentToolbar;
+  private Container buildingBlocksToolbar;
   private List<String> pendingRecentComponents = null;
 
   public ComponentTabbedPane(IPlugInPort plugInPort) {
     super();
     this.plugInPort = plugInPort;
-    addTab("Recently Used", createRecentComponentsPanel());
+    addTab("Recently Used", createRecentComponentsPanel());
+//    addTab("Building Blocks", createBuildingBlocksPanel());
     Map<String, List<ComponentType>> componentTypes = plugInPort.getComponentTypes();
     List<String> categories = new ArrayList<String>(componentTypes.keySet());
     Collections.sort(categories);
@@ -152,6 +154,14 @@ class ComponentTabbedPane extends JTabbedPane {
       recentToolbar.setLayout(new BoxLayout(recentToolbar, BoxLayout.X_AXIS));
     }
     return recentToolbar;
+  }
+  
+  public Container getBuildingBlocksToolbar() {
+    if (buildingBlocksToolbar == null) {
+      buildingBlocksToolbar = new Container();
+      buildingBlocksToolbar.setLayout(new BoxLayout(buildingBlocksToolbar, BoxLayout.X_AXIS));
+    }
+    return buildingBlocksToolbar;
   }
 
   private Component createComponentPanel(List<ComponentType> componentTypes) {
@@ -193,7 +203,33 @@ class ComponentTabbedPane extends JTabbedPane {
     panel.add(toolbar, BorderLayout.CENTER);
 
     return panel;
-  }
+  }
+  
+  @SuppressWarnings("unchecked")
+  private Component createBuildingBlocksPanel() {
+    JPanel panel = new JPanel(new BorderLayout());
+    panel.setOpaque(false);
+
+    final Container toolbar = getBuildingBlocksToolbar();
+//    refreshRecentComponentsToolbar(
+//        toolbar,
+//        (List<String>) ConfigurationManager.getInstance().readObject(IPlugInPort.RECENT_COMPONENTS_KEY,
+//            new ArrayList<String>()));
+//    ConfigurationManager.getInstance().addConfigListener(IPlugInPort.RECENT_COMPONENTS_KEY, new IConfigListener() {
+//
+//      @Override
+//      public void valueChanged(String key, Object value) {
+//        // Cache the new list, we'll refresh when there's a
+//        // chance
+//        pendingRecentComponents = (List<String>) value;
+//      }
+//    });
+
+    panel.add(toolbar, BorderLayout.CENTER);
+
+    return panel;
+  }
+
 
   @SuppressWarnings("unchecked")
   private void refreshRecentComponentsToolbar(Container toolbar, List<String> recentComponentClassList) {