--- a/ClassPlan.xml	Thu Oct 13 09:08:38 2016 -0400
+++ b/ClassPlan.xml	Sat Oct 15 09:54:56 2016 -0400
@@ -15,6 +15,7 @@
       <OnLoad method="OnLoad" />
       <OnEvent method="OnEvent" />
       <OnShow method="OnShow" />
+      <OnHide method="OnHide" />
     </Scripts>
     <Layers>
       <Layer level="ARTWORK">
@@ -29,7 +30,36 @@
     </Layers>
   </Frame>
 
-  <Frame name="ClassPlanBlock" mixin="ClassPlanBlockMixin" virtual="true" hidden="true">
+  <Button name="ClassPlanButton" parent="UIParent">
+    <Size x="400" y="16" />
+    <Anchors>
+      <Anchor point="TOP" relativePoint="BOTTOM" relativeTo="ClassOrderPlan" />
+      <Anchor point="LEFT" relativeTo="ClassOrderPlan" />
+      <Anchor point="RIGHT" relativeTo="ClassOrderPlan" />
+    </Anchors>
+    <Layers>
+      <Layer level="ARTWORK">
+        <Texture alphaMode="BLEND" file="Interface\RaidFrame\Raid-Move-Down">
+          <Anchors>
+            <Anchor point="TOP" />
+          </Anchors>
+          <Size x="32" y="16"/>
+        </Texture>
+      </Layer>
+      <Layer level="HIGHLIGHT">
+        <Texture setAllPoints="true" alphaMode="ADD">
+          <Color a="0.25" r="1" g="1" b="1" />
+        </Texture>
+      </Layer>
+    </Layers>
+    <Scripts>
+      <OnClick>
+        ClassOrderPlan:Toggle()
+      </OnClick>
+    </Scripts>
+  </Button>
+
+  <Button name="ClassPlanBlock" mixin="ClassPlanBlockMixin" virtual="true" hidden="true">
     <Size x="400" y="32" />
     <Scripts>
       <OnUpdate method="OnUpdate" />
@@ -74,10 +104,11 @@
         </Texture>
       </Layer>
     </Layers>
-  </Frame>
+  </Button>
 
-  <Frame name="ClassPlanShipment" mixin="ClassPlanShipmentMixin" virtual="true">
+  <Button name="ClassPlanShipment" mixin="ClassPlanShipmentMixin" virtual="true">
     <Scripts>
+      <OnClick method="OnClick" />
       <OnUpdate method="OnUpdate" />
       <OnShow method="OnShow" />
       <OnEnter method="OnEnter" />
@@ -148,5 +179,5 @@
         </Scripts>
       </Cooldown>
     </Frames>
-  </Frame>
+  </Button>
 </Ui>
\ No newline at end of file