--- a/ClassPlan.xml	Sat Oct 15 09:54:56 2016 -0400
+++ b/ClassPlan.xml	Mon Oct 17 12:59:24 2016 -0400
@@ -6,40 +6,22 @@
   <Font name="ClassPlanFont" font="Interface\AddOns\Veneer\Font\ArchivoNarrow-Regular.ttf" height="14" outline="NORMAL" virtual="true" />
   <Font name="ClassPlanNumberFont" font="Interface\AddOns\Veneer\Font\ArchivoNarrow-Bold.ttf" height="14" outline="NORMAL" virtual="true" />
 
-  <Frame name="ClassOrderPlan" mixin="ClassOrderPlanCore" parent="UIParent" hidden="true">
-    <Size x="600" y="40" />
-    <Anchors>
-      <Anchor point="TOP" />
-    </Anchors>
-    <Scripts>
-      <OnLoad method="OnLoad" />
-      <OnEvent method="OnEvent" />
-      <OnShow method="OnShow" />
-      <OnHide method="OnHide" />
-    </Scripts>
-    <Layers>
-      <Layer level="ARTWORK">
-        <Texture parentKey="portrait">
-          <Size x="40" y="40" />
-          <Anchors>
-            <Anchor point="TOPLEFT" />
-
-          </Anchors>
-        </Texture>
-      </Layer>
-    </Layers>
-  </Frame>
-
-  <Button name="ClassPlanButton" parent="UIParent">
-    <Size x="400" y="16" />
+  <Button name="ClassPlanButton" parent="UIParent" frameStrata="HIGH">
+    <Size x="600" y="16" />
     <Anchors>
       <Anchor point="TOP" relativePoint="BOTTOM" relativeTo="ClassOrderPlan" />
       <Anchor point="LEFT" relativeTo="ClassOrderPlan" />
       <Anchor point="RIGHT" relativeTo="ClassOrderPlan" />
     </Anchors>
     <Layers>
+      <Layer level="BACKGROUND">
+        <Texture setAllPoints="true" parentKey="Background" hidden="true">
+          <Color a="1" r="0" g="0" b="0" />
+        </Texture>
+      </Layer>
       <Layer level="ARTWORK">
-        <Texture alphaMode="BLEND" file="Interface\RaidFrame\Raid-Move-Down">
+
+        <Texture parentKey="Grip" alphaMode="BLEND" file="Interface\RaidFrame\Raid-Move-Down">
           <Anchors>
             <Anchor point="TOP" />
           </Anchors>
@@ -59,6 +41,36 @@
     </Scripts>
   </Button>
 
+  <Frame name="ClassOrderPlan" mixin="ClassOrderPlanCore" parent="UIParent" hidden="true">
+    <Size x="600" y="40" />
+    <Anchors>
+      <Anchor point="TOP" />
+    </Anchors>
+    <Scripts>
+      <OnLoad method="OnLoad" />
+      <OnEvent method="OnEvent" />
+      <OnShow method="OnShow" />
+      <OnHide method="OnHide" />
+    </Scripts>
+    <Layers>
+      <Layer level="BACKGROUND">
+        <Texture parentKey="Background" setAllPoints="true">
+          <Color a="0.5" r="0" b="0" g="0" />
+        </Texture>
+      </Layer>
+      <Layer level="ARTWORK">
+        <Texture parentKey="portrait">
+          <Size x="40" y="40" />
+          <Anchors>
+            <Anchor point="TOPLEFT" />
+
+          </Anchors>
+        </Texture>
+      </Layer>
+    </Layers>
+  </Frame>
+
+
   <Button name="ClassPlanBlock" mixin="ClassPlanBlockMixin" virtual="true" hidden="true">
     <Size x="400" y="32" />
     <Scripts>
@@ -79,12 +91,13 @@
           <Anchors>
             <Anchor point="TOPLEFT" />
           </Anchors>
+          <TexCoords left="0.15" right=".85" top="0.15" bottom="0.85" />
         </Texture>
       </Layer>
       <Layer level="OVERLAY">
         <FontString name="$parentLabel" inherits="ClassPlanFont" parentKey="Label" text="base text">
           <Anchors>
-            <Anchor point="TOPLEFT" relativePoint="TOPRIGHT" relativeKey="$parent.Icon" x="4" y="0" />
+            <Anchor point="TOPLEFT" relativePoint="TOPRIGHT" relativeKey="$parent.Icon" x="4" y="-2" />
           </Anchors>
         </FontString>
         <FontString name="$parentTimeLeft" inherits="ClassPlanNumberFont" parentKey="TimeLeft" text="base text">
@@ -92,16 +105,16 @@
             <Anchor point="TOPLEFT" relativePoint="BOTTOMLEFT" relativeKey="$parent.Label" x="4" y="-2" />
           </Anchors>
         </FontString>
-        <FontString name="$parentOwner" inherits="ClassPlanFont" parentKey="Owner" text="base text">
-          <Anchors>
-            <Anchor point="TOPRIGHT" />
-          </Anchors>
-        </FontString>
       </Layer>
       <Layer level="HIGHLIGHT">
         <Texture setAllPoints="true" alphaMode="ADD">
           <Color a="1" r="0.1" g="0.1" b="0.1" />
         </Texture>
+        <FontString name="$parentOwner" inherits="ClassPlanFont" parentKey="Owner" text="base text">
+          <Anchors>
+            <Anchor point="TOPRIGHT" x="-2" y="-2" />
+          </Anchors>
+        </FontString>
       </Layer>
     </Layers>
   </Button>
@@ -120,11 +133,12 @@
         <Texture parentKey="Background" setAllPoints="true" />
       </Layer>
       <Layer level="BACKGROUND" textureSubLevel="1">
-        <Texture parentKey="Icon" alpha="0.5" desaturated="true">
-          <Size x="30" y="30"/>
+        <Texture parentKey="Icon" alpha="1" desaturated="true">
+          <Size x="32" y="32"/>
           <Anchors>
             <Anchor point="LEFT"/>
           </Anchors>
+          <TexCoords left="0.15" right=".85" top="0.15" bottom="0.85" />
         </Texture>
       </Layer>
       <Layer level="BORDER">
@@ -154,20 +168,23 @@
             <Anchor point="BOTTOM" relativeKey="$parent.Icon" x="0" y="0"/>
           </Anchors>
         </FontString>
+      </Layer>
+      <Layer level="HIGHLIGHT">
+
         <FontString name="$parentOwner" inherits="WorldPlanFont" parentKey="Owner" text="base text">
           <Anchors>
-            <Anchor point="TOPRIGHT" />
+            <Anchor point="TOPRIGHT" x="-2" y="-2" />
           </Anchors>
         </FontString>
       </Layer>
     </Layers>
     <Frames>
-      <Cooldown parentKey="Swipe" reverse="true" hideCountdownNumbers="true">
+      <Cooldown parentKey="Swipe" inherits="CooldownFrameTemplate" reverse="true" hideCountdownNumbers="true">
         <Size x="32" y="32"/>
         <Anchors>
-          <Anchor point="LEFT"/>
+          <Anchor point="TOPLEFT"/>
+          <Anchor point="BOTTOMRIGHT" relativePoint="BOTTOMLEFT" x="32" y="0" />
         </Anchors>
-        <SwipeTexture file="Interface\Garrison\GarrLanding-TradeskillTimerFill"/>
         <Scripts>
           <OnCooldownStart>
             self:Show()