--- a/ClassPlan.xml	Mon Oct 17 12:59:24 2016 -0400
+++ b/ClassPlan.xml	Tue Oct 18 01:50:06 2016 -0400
@@ -28,6 +28,13 @@
           <Size x="32" y="16"/>
         </Texture>
       </Layer>
+      <Layer level="OVERLAY">
+        <FontString parentKey="Label" inherits="ClassPlanFont">
+          <Anchors>
+            <Anchor point="BOTTOMLEFT" x="2" y="2" />
+          </Anchors>
+        </FontString>
+      </Layer>
       <Layer level="HIGHLIGHT">
         <Texture setAllPoints="true" alphaMode="ADD">
           <Color a="0.25" r="1" g="1" b="1" />
@@ -72,7 +79,7 @@
 
 
   <Button name="ClassPlanBlock" mixin="ClassPlanBlockMixin" virtual="true" hidden="true">
-    <Size x="400" y="32" />
+    <Size x="400" y="24" />
     <Scripts>
       <OnUpdate method="OnUpdate" />
       <OnShow method="OnShow" />
@@ -87,7 +94,7 @@
       </Layer>
       <Layer level="ARTWORK">
         <Texture name="$parentIcon" parentKey="Icon">
-          <Size x="32" y="32" />
+          <Size x="24" y="24" />
           <Anchors>
             <Anchor point="TOPLEFT" />
           </Anchors>
@@ -95,14 +102,14 @@
         </Texture>
       </Layer>
       <Layer level="OVERLAY">
-        <FontString name="$parentLabel" inherits="ClassPlanFont" parentKey="Label" text="base text">
+        <FontString name="$parentName" inherits="ClassPlanFont" parentKey="Name" text="base text">
           <Anchors>
-            <Anchor point="TOPLEFT" relativePoint="TOPRIGHT" relativeKey="$parent.Icon" x="4" y="-2" />
+            <Anchor point="LEFT" relativePoint="RIGHT" relativeKey="$parent.Icon" x="4" y="0" />
           </Anchors>
         </FontString>
         <FontString name="$parentTimeLeft" inherits="ClassPlanNumberFont" parentKey="TimeLeft" text="base text">
           <Anchors>
-            <Anchor point="TOPLEFT" relativePoint="BOTTOMLEFT" relativeKey="$parent.Label" x="4" y="-2" />
+            <Anchor point="RIGHT" x="-4" y="0" />
           </Anchors>
         </FontString>
       </Layer>
@@ -112,7 +119,7 @@
         </Texture>
         <FontString name="$parentOwner" inherits="ClassPlanFont" parentKey="Owner" text="base text">
           <Anchors>
-            <Anchor point="TOPRIGHT" x="-2" y="-2" />
+            <Anchor point="RIGHT" relativePoint="LEFT" x="-4" y="0" relativeKey="$parent.TimeLeft" />
           </Anchors>
         </FontString>
       </Layer>
@@ -143,9 +150,9 @@
       </Layer>
       <Layer level="BORDER">
         <Texture parentKey="Done" atlas="GarrLanding-ShipmentCompleteGlow">
-          <Size x="32" y="32" />
+          <Size x="24" y="24" />
           <Anchors>
-            <Anchor point="LEFT"/>
+            <Anchor point="BOTTOMLEFT"/>
           </Anchors>
         </Texture>
       </Layer>
@@ -165,7 +172,7 @@
         </FontString>
         <FontString parentKey="Count" inherits="WorldPlanFont" justifyH="CENTER">
           <Anchors>
-            <Anchor point="BOTTOM" relativeKey="$parent.Icon" x="0" y="0"/>
+            <Anchor point="BOTTOMRIGHT" relativeKey="$parent.Icon" x="0" y="0"/>
           </Anchors>
         </FontString>
       </Layer>