--- a/ClassPlan.xml	Tue Oct 18 01:50:06 2016 -0400
+++ b/ClassPlan.xml	Fri Oct 21 18:10:53 2016 -0400
@@ -21,7 +21,7 @@
       </Layer>
       <Layer level="ARTWORK">
 
-        <Texture parentKey="Grip" alphaMode="BLEND" file="Interface\RaidFrame\Raid-Move-Down">
+        <Texture parentKey="Grip" alphaMode="BLEND" file="Interface\RaidFrame\Raid-Move-Down" hidden="true">
           <Anchors>
             <Anchor point="TOP" />
           </Anchors>
@@ -78,9 +78,16 @@
   </Frame>
 
 
-  <Button name="ClassPlanBlock" mixin="ClassPlanBlockMixin" virtual="true" hidden="true">
-    <Size x="400" y="24" />
+  <Button name="ClassPlanListEntryTemplate" virtual="true" hidden="true">
+
     <Scripts>
+      <OnLoad>
+        self.Count = self.Overlay.Count
+        self.Name = self.Overlay.Name
+        self.TimeLeft = self.Overlay.TimeLeft
+        self.Owner = self.Overlay.Owner
+      </OnLoad>
+      <OnClick method="OnClick" />
       <OnUpdate method="OnUpdate" />
       <OnShow method="OnShow" />
       <OnEnter method="OnEnter" />
@@ -88,67 +95,42 @@
     </Scripts>
     <Layers>
       <Layer level="BACKGROUND">
-        <Texture setAllPoints="true" parentKey="Background">
-          <Color a=".5" r="0" g="0" b="0" />
-        </Texture>
-      </Layer>
-      <Layer level="ARTWORK">
-        <Texture name="$parentIcon" parentKey="Icon">
-          <Size x="24" y="24" />
-          <Anchors>
-            <Anchor point="TOPLEFT" />
-          </Anchors>
-          <TexCoords left="0.15" right=".85" top="0.15" bottom="0.85" />
-        </Texture>
-      </Layer>
-      <Layer level="OVERLAY">
-        <FontString name="$parentName" inherits="ClassPlanFont" parentKey="Name" text="base text">
-          <Anchors>
-            <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="RIGHT" x="-4" y="0" />
-          </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="RIGHT" relativePoint="LEFT" x="-4" y="0" relativeKey="$parent.TimeLeft" />
-          </Anchors>
-        </FontString>
-      </Layer>
-    </Layers>
-  </Button>
-
-  <Button name="ClassPlanShipment" mixin="ClassPlanShipmentMixin" virtual="true">
-    <Scripts>
-      <OnClick method="OnClick" />
-      <OnUpdate method="OnUpdate" />
-      <OnShow method="OnShow" />
-      <OnEnter method="OnEnter" />
-      <OnLeave method="OnLeave" />
-    </Scripts>
-    <Size x="200" y="32" />
-    <Layers>
-      <Layer level="BACKGROUND">
         <Texture parentKey="Background" setAllPoints="true" />
       </Layer>
       <Layer level="BACKGROUND" textureSubLevel="1">
         <Texture parentKey="Icon" alpha="1" desaturated="true">
-          <Size x="32" y="32"/>
+          <Size x="24" y="24"/>
           <Anchors>
             <Anchor point="LEFT"/>
           </Anchors>
           <TexCoords left="0.15" right=".85" top="0.15" bottom="0.85" />
         </Texture>
+
+        <Texture parentKey="ProgressBG" hidden="true">
+          <Size y="2" />
+          <Anchors>
+            <Anchor point="RIGHT" />
+            <Anchor point="BOTTOMLEFT" relativePoint="BOTTOMRIGHT" relativeKey="$parent.Icon" />
+          </Anchors>
+          <Color a="0.5" r="0" g="0" b="0" />
+        </Texture>
       </Layer>
       <Layer level="BORDER">
+        <Texture parentKey="IconBorder" file="Interface\Common\WhiteIconFrame">
+          <Size x="24" y="24"/>
+          <Anchors>
+            <Anchor point="CENTER" relativeKey="$parent.Icon"/>
+          </Anchors>
+        </Texture>
+        <Texture parentKey="ProgressBar" hidden="true">
+          <Size y="1" />
+          <Anchors>
+            <Anchor point="BOTTOMLEFT" relativeKey="$parent.ProgressBG" />
+          </Anchors>
+          <Color a="0.5" r="1" g="1" b="1" />
+        </Texture>
+      </Layer>
+      <Layer level="ARTWORK">
         <Texture parentKey="Done" atlas="GarrLanding-ShipmentCompleteGlow">
           <Size x="24" y="24" />
           <Anchors>
@@ -156,41 +138,13 @@
           </Anchors>
         </Texture>
       </Layer>
-      <Layer level="ARTWORK">
-        <FontString parentKey="Name" inherits="ClassPlanFont" justifyV="TOP" justifyH="CENTER">
-          <Anchors>
-            <Anchor point="TOPLEFT" relativePoint="TOPRIGHT" relativeKey="$parent.Icon" x="2" y="-2"/>
-          </Anchors>
-          <Color r=".75" g=".75" b=".73"/>
-        </FontString>
-      </Layer>
-      <Layer level="OVERLAY">
-        <FontString parentKey="TimeLeft" inherits="ClassPlanFont" justifyH="CENTER">
-          <Anchors>
-            <Anchor point="TOPLEFT" relativePoint="BOTTOMLEFT" relativeKey="$parent.Name" x="0" y="-2"/>
-          </Anchors>
-        </FontString>
-        <FontString parentKey="Count" inherits="WorldPlanFont" justifyH="CENTER">
-          <Anchors>
-            <Anchor point="BOTTOMRIGHT" 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" x="-2" y="-2" />
-          </Anchors>
-        </FontString>
-      </Layer>
     </Layers>
     <Frames>
       <Cooldown parentKey="Swipe" inherits="CooldownFrameTemplate" reverse="true" hideCountdownNumbers="true">
-        <Size x="32" y="32"/>
+        <Size x="24" y="24"/>
         <Anchors>
           <Anchor point="TOPLEFT"/>
-          <Anchor point="BOTTOMRIGHT" relativePoint="BOTTOMLEFT" x="32" y="0" />
+          <Anchor point="BOTTOMRIGHT" relativePoint="BOTTOMLEFT" x="24" y="0" />
         </Anchors>
         <Scripts>
           <OnCooldownStart>
@@ -202,6 +156,46 @@
           </OnCoolDownDone>
         </Scripts>
       </Cooldown>
+      <Frame parentKey="Overlay" name="$parentOverlay" setAllPoints="true">
+        <Layers>
+          <Layer level="OVERLAY">
+
+            <FontString parentKey="Name" inherits="ClassPlanFont" justifyV="TOP" justifyH="CENTER">
+              <Anchors>
+                <Anchor point="LEFT" x="26" y="0"/>
+              </Anchors>
+              <Color r=".75" g=".75" b=".73"/>
+            </FontString>
+            <FontString parentKey="TimeLeft" inherits="ClassPlanFont" justifyH="CENTER">
+              <Anchors>
+                <Anchor point="RIGHT" x="-2" y="0"/>
+              </Anchors>
+            </FontString>
+            <FontString parentKey="Count" inherits="WorldPlanFont" justifyH="CENTER">
+              <Anchors>
+                <Anchor point="CENTER" relativePoint="LEFT" x="12" y="0"/>
+              </Anchors>
+            </FontString>
+          </Layer>
+          <Layer level="HIGHLIGHT">
+
+            <FontString parentKey="Owner" inherits="WorldPlanFont" text="base text">
+              <Anchors>
+                <Anchor point="TOPRIGHT" x="-2" y="-2" />
+              </Anchors>
+            </FontString>
+          </Layer>
+        </Layers>
+      </Frame>
     </Frames>
   </Button>
+
+
+  <Button name="ClassPlanMissionEntry" inherits="ClassPlanListEntryTemplate" mixin="ClassPlanMissionMixin" virtual="true">
+    <Size x="300" y="24" />
+  </Button>
+
+  <Button name="ClassPlanShipmentEntry" inherits="ClassPlanListEntryTemplate" mixin="ClassPlanShipmentMixin" virtual="true">
+    <Size x="300" y="24" />
+  </Button>
 </Ui>
\ No newline at end of file