--- a/ClassPlan.xml	Fri Nov 04 02:54:32 2016 -0400
+++ b/ClassPlan.xml	Sun Dec 25 13:04:57 2016 -0500
@@ -18,20 +18,45 @@
       <OnShow method="OnShow" />
       <OnHide method="OnHide" />
       <OnUpdate method="OnUpdate" />
+      <OnDragStart method="OnDragStart" />
+      <OnDragStop method="OnDragStop" />
     </Scripts>
+    <Animations>
+      <AnimationGroup parentKey="FadeIn" setToFinalAlpha="true">
+        <Alpha parentKey="AlphaFade" fromAlpha="0" toAlpha="1" duration=".3" order="1" />
+      </AnimationGroup>
+      <AnimationGroup parentKey="FadeOut">
+
+        <Alpha parentKey="AlphaFade" fromAlpha="1" toAlpha="0" duration=".3" order="1" />
+      </AnimationGroup>
+    </Animations>
     <Layers>
       <Layer level="BACKGROUND">
-        <Texture parentKey="Background" setAllPoints="true">
-          <Color a="0.5" r="0" b="0" g="0" />
+        <Texture parentKey="HeaderInset">
+          <Size y="24" />
+          <Anchors>
+            <Anchor point="TOPLEFT" x="0" y="0" />
+            <Anchor point="RIGHT" x="0" y="0" />
+          </Anchors>
+          <Color r="0" g="0" b="0" a="0.5" />
         </Texture>
       </Layer>
       <Layer level="ARTWORK">
-        <Texture parentKey="portrait">
-          <Size x="40" y="40" />
+        <Texture parentKey="ClassStripe">
+          <Size y="4" />
           <Anchors>
-            <Anchor point="TOPLEFT" />
+            <Anchor point="TOPLEFT" relativePoint="BOTTOMLEFT" relativeKey="$parent.HeaderInset" x="0" y="-24" />
+            <Anchor point="RIGHT" />
+          </Anchors>
+          <Color a="1" r="0" b="0" g="0" />
+        </Texture>
+        <Texture parentKey="BackgroundInset">
+          <Anchors>
+            <Anchor point="TOPLEFT" relativePoint="BOTTOMLEFT" relativeKey="$parent.ClassStripe" x="0" y="0" />
 
+            <Anchor point="BOTTOMRIGHT" />
           </Anchors>
+          <Color a="0.65" r="0" g="0" b="0" />
         </Texture>
       </Layer>
     </Layers>
@@ -49,6 +74,41 @@
       <OnMouseWheel method="OnMouseWheel" />
     </Scripts>
     <Frames>
+      <Button name="$parentTab" parentKey="ListTab" mixin="ClassPlanHeaderMixin">
+        <Anchors>
+          <Anchor point="TOPLEFT" />
+          <Anchor point="RIGHT" />
+        </Anchors>
+        <Scripts>
+          <OnLoad method="OnLoad" />
+          <OnClick method="OnClick" />
+        </Scripts>
+        <Size y="24" />
+        <Layers>
+          <Layer level="BACKGROUND">
+            <Texture parentKey="Background">
+              <Color a="1" r="0" g="0" b="0" />
+            </Texture>
+          </Layer>
+          <Layer level="OVERLAY">
+            <FontString parentKey="Label" inherits="ClassPlanFont">
+              <Anchors>
+                <Anchor point="CENTER" />
+              </Anchors>
+            </FontString>
+            <FontString parentKey="Count" inherits="ClassPlanFont">
+              <Anchors>
+                <Anchor point="LEFT" x="3" y="0" />
+              </Anchors>
+            </FontString>
+          </Layer>
+          <Layer level="HIGHLIGHT">
+            <Texture parentKey="Highlight">
+              <Color a="0.5" r="1" g="1" b="1" />
+            </Texture>
+          </Layer>
+        </Layers>
+      </Button>
       <Frame parentKey="MoreItemsUp" frameStrata="HIGH" hidden="true">
         <Size y="24" />
         <Anchors>
@@ -87,11 +147,31 @@
         </Layers>
       </Frame>
     </Frames>
+    <Layers>
+      <Layer level="OVERLAY">
+        <FontString parentKey="Count" inherits="ClassPlanFont">
+          <Anchors>
+            <Anchor point="BOTTOMLEFT" relativePoint="TOPLEFT" x="0" y="3" />
+          </Anchors>
+        </FontString>
+      </Layer>
+    </Layers>
   </Frame>
 
-
-  <Frame name="$parentShipments" parentKey="Shipments" mixin="ClassPlanShipmentHandler" inherits="ClassPlanPanelTemplate" />
   <Button name="ClassPlanListEntryTemplate" virtual="true" hidden="true">
+    <Animations>
+      <AnimationGroup parentKey="NewBlockFade">
+        <Scripts>
+          <OnStop>
+            self:GetParent():OnAnimFinished()
+          </OnStop>
+          <OnFinished>
+            self:GetParent():OnAnimFinished()
+          </OnFinished>
+        </Scripts>
+        <Alpha parentKey="AlphaFade" duration="0.5" fromAlpha="0" toAlpha="1" order="1" />
+      </AnimationGroup>
+    </Animations>
     <Scripts>
       <OnLoad method="OnLoad" />
       <OnClick method="OnClick" />
@@ -138,13 +218,19 @@
         </Texture>
       </Layer>
       <Layer level="ARTWORK">
-        <Texture parentKey="Done" atlas="GarrLanding-ShipmentCompleteGlow">
+        <Texture parentKey="Done" atlas="GarrLanding-ShipmentCompleteGlow" hidden="true">
           <Size x="24" y="24" />
           <Anchors>
             <Anchor point="BOTTOMLEFT"/>
           </Anchors>
         </Texture>
       </Layer>
+      <Layer level="HIGHLIGHT">
+
+        <Texture setAllPoints="true">
+          <Color a="0.25" r="1" g="1" b="1" />
+        </Texture>
+      </Layer>
     </Layers>
     <Frames>
       <Cooldown parentKey="Swipe" inherits="CooldownFrameTemplate" reverse="true" hideCountdownNumbers="true">
@@ -167,20 +253,21 @@
         <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="Name" inherits="ClassPlanFont" justifyV="TOP" wordwrap="false" justifyH="LEFT">
+              <Anchors>
+                <Anchor point="LEFT" x="26" y="0"/>
+                <Anchor point="RIGHT" relativePoint="LEFT" relativeKey="$parent.TimeLeft" x="-4" y="0"/>
+              </Anchors>
+              <Color r=".75" g=".75" b=".73"/>
+            </FontString>
             <FontString parentKey="Count" inherits="WorldPlanFont" justifyH="CENTER">
               <Anchors>
-                <Anchor point="CENTER" relativePoint="LEFT" x="12" y="0"/>
+                <Anchor point="BOTTOMRIGHT" relativePoint="BOTTOMRIGHT" x="2" y="1" relativeKey="$parent.$parent.Icon"/>
               </Anchors>
             </FontString>
           </Layer>
@@ -216,6 +303,11 @@
           <TexCoords left="0.5" right="1" top="0" bottom="0.5" />
         </Texture>
       </Layer>
+      <Layer level="HIGHLIGHT">
+        <Texture parentKey="HighlightGlow" file="Interface\Glues\CHARACTERCREATE\UI-CharacterCreate-Highlights" alphaMode="ADD" alpha="0.5">
+          <TexCoords left="0" right="0.5" top="0" bottom="0.5" />
+        </Texture>
+      </Layer>
     </Layers>
   </Button>