diff --git a/client/public/stylesheets/olympus.css b/client/public/stylesheets/olympus.css
index d76be148..979b1bd5 100644
--- a/client/public/stylesheets/olympus.css
+++ b/client/public/stylesheets/olympus.css
@@ -544,19 +544,19 @@ nav.ol-panel> :last-child {
     margin-bottom: 11px;
 }
 
-#unit-control-panel #unit-identification .unit {
+#unit-control-panel #unit-identification [data-object|="unit"] {
     height: 28px;
     margin-right: 6px;
     width: 28px;
 }
 
-#unit-control-panel #unit-identification .unit .unit-marker {
+#unit-control-panel #unit-identification [data-object|="unit"] .unit-marker {
     background-size: 28px 28px;
     height: 28px;
     width: 28px;
 }
 
-#unit-control-panel #unit-identification .unit .unit-short-label {
+#unit-control-panel #unit-identification [data-object|="unit"] .unit-short-label {
     font-size: 12px;
 }
 
diff --git a/client/views/unitcontrolpanel.ejs b/client/views/unitcontrolpanel.ejs
index 51fb63b0..4e093c2f 100644
--- a/client/views/unitcontrolpanel.ejs
+++ b/client/views/unitcontrolpanel.ejs
@@ -1,35 +1,67 @@
 <div id="unit-control-panel" class="ol-panel ol-panel-padding-lg"> 
-    <div id="unit-identification">
-        <div class="unit unit-air no-function">
-            <div class="unit-marker"></div>
-            <div class="unit-short-label">18</div>
+
+    <div id="unit-info-panel">
+
+        <div id="unit-identification">
+            <div data-object="unit-air-aircraft">
+                <div class="unit-marker"></div>
+                <div class="unit-short-label">18</div>
+            </div>
+            
+            <input id="unit-name" value="Olympus 1-1" readonly disabled />
+
+            <!-- <button id="edit-unit-name" data-on-click="editUnitName"></button> -->
         </div>
-        
-        <input id="unit-name" value="Olympus 1-1" readonly disabled />
 
-        <!-- <button id="edit-unit-name" data-on-click="editUnitName"></button> -->
-    </div>
+        <div class="ol-group">
+            <div id="name" class="pill highlight-primary">Name</div>
+            <div id="group-name" class="pill highlight-primary">Group</div>
+            <div id="task" class="pill highlight-primary">Task</div>
+        </div>
 
-    <div id="selected-units-container" class="ol-scroll">
-        <!-- This is where all the unit selection buttons will be shown-->
-    </div>
+        <div id="selected-units-container" class="ol-scroll">
+            <!-- This is where all the unit selection buttons will be shown-->
+        </div>
 
-    <div id="flight-data">
-        <h4>Flight controls</h4>
-        <div class="slider-container flight-control-slider" id="airspeed-slider">
+        <div id="flight-data">
+
+            <h4 id="loadout-label">Flight data</h4>
+            
             <dl class="data-grid">
+                <dt>Heading</dt>
+                <dd id="heading">123&deg;</dd>
                 <dt>Speed</dt>
-                <dd class="flight-control-value" id="value">451kts</dd>
+                <dd id="ground-speed">323kts</dd>
+                <dt>Altitude</dt>
+                <dd id="altitude">27,414ft</dd>
             </dl>
-            <input type="range" min="1" max="100" value="0" class="slider">
+
+            <h4>Flight controls</h4>
+            <div class="slider-container flight-control-slider" id="airspeed-slider">
+                <dl class="data-grid">
+                    <dt>Speed</dt>
+                    <dd class="flight-control-value" id="value">451kts</dd>
+                </dl>
+                <input type="range" min="1" max="600" value="451" class="slider">
+            </div>
+
+            <div class="slider-container flight-control-slider" id="altitude-slider">
+                <dl class="data-grid">
+                    <dt>Altitude</dt>
+                    <dd class="flight-control-value" id="value">21,594ft</dd>
+                </dl>
+                <input type="range" min="1" max="50000" value="21594" class="slider">
+            </div>
+            
         </div>
 
-        <div class="slider-container flight-control-slider" id="altitude-slider">
-            <dl class="data-grid">
-                <dt>Altitude</dt>
-                <dd class="flight-control-value" id="value">21,594ft</dd>
-            </dl>
-            <input type="range" min="1" max="100" value="0" class="slider">
+        <div id="loadout-data" class="panel-section">
+            <h4 id="loadout-label">Loadout<span id="loadout-fuel-level" data-fuel-level="69"></span></h4>
+            <div id="loadout-container" class="ol-group">
+                <div class="pill loadout-item" data-qty="2" data-item="AIM-120B"></div>
+                <div class="pill loadout-item" data-qty="2" data-item="AIM-9P"></div>
+                <div class="pill loadout-item" data-qty="100" data-item="AIM-120B"></div>
+            </div>
         </div>
     </div>