diff --git a/Juice/AccordionPanel.cs b/Juice/AccordionPanel.cs
index 0ea41e3..d70cd41 100644
--- a/Juice/AccordionPanel.cs
+++ b/Juice/AccordionPanel.cs
@@ -21,13 +21,13 @@ public class AccordionPanel : Control, INamingContainer {
 			}
 		}
 
-		[TemplateContainer(typeof(AccordionPanelTemplateContainer))]
+		[TemplateContainer(typeof(JuiceTemplateContainer))]
 		[PersistenceMode(PersistenceMode.InnerProperty)]
 		public ITemplate PanelContent { get; set; }
 
 		protected override void CreateChildControls() {
 			if(PanelContent != null) {
-				_templateContainer = new AccordionPanelTemplateContainer();
+				_templateContainer = new JuiceTemplateContainer();
 				PanelContent.InstantiateIn(_templateContainer);
 				Controls.Add(_templateContainer);
 			}
diff --git a/Juice/JuiceTemplateContainer.cs b/Juice/JuiceTemplateContainer.cs
new file mode 100644
index 0000000..104af77
--- /dev/null
+++ b/Juice/JuiceTemplateContainer.cs
@@ -0,0 +1,10 @@
+using System.Web.UI;
+using System.ComponentModel;
+
+namespace Juice {
+
+	[ToolboxItem(false)]
+	public class JuiceTemplateContainer : Control, INamingContainer {
+
+	}
+}
\ No newline at end of file
diff --git a/Juice/JuiceUI.csproj b/Juice/JuiceUI.csproj
index 521cb57..aff90a3 100644
--- a/Juice/JuiceUI.csproj
+++ b/Juice/JuiceUI.csproj
@@ -69,8 +69,10 @@
   <ItemGroup>
     <Compile Include="Accordion.cs" />
     <Compile Include="AccordionPanel.cs" />
-    <Compile Include="AccordionPanelTemplateContainer.cs" />
+    <Compile Include="JuiceTemplateContainer.cs" />
     <Compile Include="Buttonset.cs" />
+    <Compile Include="Menu.cs" />
+    <Compile Include="MenuItem.cs" />
     <Compile Include="Tooltip.cs" />
     <Compile Include="Spinner.cs" />
     <Compile Include="CssPlaceholder.cs" />
@@ -118,7 +120,6 @@
     <Compile Include="Framework\WidgetHash.cs" />
     <Compile Include="Sortable.cs" />
     <Compile Include="TabPage.cs" />
-    <Compile Include="TabPageTemplateContainer.cs" />
     <Compile Include="Tabs.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Juice/TabPage.cs b/Juice/TabPage.cs
index ba84b8e..fed3d0e 100644
--- a/Juice/TabPage.cs
+++ b/Juice/TabPage.cs
@@ -23,13 +23,13 @@ public class TabPage : Control, INamingContainer {
 		}
 
 		[PersistenceMode(PersistenceMode.InnerProperty)]
-		[TemplateContainer(typeof(TabPageTemplateContainer))]
+		[TemplateContainer(typeof(JuiceTemplateContainer))]
 		[DefaultValue((string) null)]
 		public ITemplate TabContent { get; set; }
 
 		protected override void CreateChildControls() {
 			if(TabContent != null) {
-				_templateContainer = new TabPageTemplateContainer();
+				_templateContainer = new JuiceTemplateContainer();
 				TabContent.InstantiateIn(_templateContainer);
 				Controls.Add(_templateContainer);
 			}