diff --git a/app/server-health/controllers/inventory-overview-controller.html b/app/server-health/controllers/inventory-overview-controller.html
index aae71b4..960a2d9 100644
--- a/app/server-health/controllers/inventory-overview-controller.html
+++ b/app/server-health/controllers/inventory-overview-controller.html
@@ -1,101 +1,373 @@
-<div id="inventory-overview">
-    <div class="row column">
-        <h1>Hardware inventory</h1>
-    </div>
-    <section class="row column">
-        <div class="page-header">
-            <h2 class="inline h4">Inventory items present in the system</h2>
-            <button class="inline btn-export float-right">Export</button>
-        </div>
-    </section>
-    <section class="row column">
-        <!-- search -->
-        <div class="content__search">
-            <label for="content__search-input">Search</label> <input id="content__search-input" type="text"
-                                                                     placeholder="Filter hardware components"/> <input
-                id="content__search-submit" type="submit" class="btn btn-secondary"
-                value="Submit"/>
-        </div>
-        <!--<div class="toggle-filter">-->
-            <!--<button class="inline first" ng-click="toggleall = !toggleall"-->
-                    <!--ng-class="toggleall ? 'btn-primary' : 'btn-secondary'">All-->
-            <!--</button>-->
-            <!--<button class="inline " ng-click="togglehigh = !togglehigh"-->
-                    <!--ng-class="togglehigh ? 'btn-primary' : 'btn-secondary'">High-->
-            <!--</button>-->
-            <!--<button class="inline" ng-click="togglemed = !togglemed"-->
-                    <!--ng-class="togglemed ? 'btn-primary' : 'btn-secondary'">Medium-->
-            <!--</button>-->
-            <!--<button class="inline last" ng-click="togglelow = !togglelow"-->
-                    <!--ng-class="togglelow ? 'btn-primary' : 'btn-secondary'">Low-->
-            <!--</button>-->
-        <!--</div>-->
-    </section>
-    <!-- end search -->
-    <section id="inventory-categories" class="row column">
-        <div class="row column header-row">
-            <div class="column large-12 header__actions-bar">
-                <p class="inline inventory__heading inventory__device-col">Hardware</p>
-                <p class="inline inventory__heading inventory__function-col">Function</p>
-                <p class="inline inventory__heading inventory__present-col">Present</p>
-                <p class="inline inventory__heading inventory__state-col">State</p>
-            </div>
-        </div>
-        <a class="inventory__group" href="">
-            <p class="inline inventory__device-col">All devices (30)</p>
-        </a>
-        <a class="inventory__group" href="">
-            <p class="inline inventory__device-col"><span class="inline priority-tag-circ normal-priority" aria-label="Normal Priority"></span>Motherboard (1)</p>
-            <p class="inline inventory__function-col inv-active">Active</p>
-            <p class="inline inventory__present-col inv-present">Present</p>
-            <p class="inline inventory__state-col">&nbsp;</p>
-        </a>
-        <a class="inventory__group" href="">
-            <p class="inline inventory__device-col"><span class="inline priority-tag-circ normal-priority" aria-label="Normal Priority"></span>CPU (1)</p>
-            <p class="inline inventory__function-col inv-active">Active</p>
-            <p class="inline inventory__present-col inv-present">Present</p>
-            <p class="inline inventory__state-col">&nbsp;</p>
-        </a>
-        <a class="inventory__group" href="#/server-health/inventory">
-            <p class="inline inventory__device-col"><span class="inline priority-tag-circ high-priority" aria-label="High Priority"></span>CPU cores (6)</p>
-            <p class="inline inventory__function-col inv-active">Active</p>
-            <p class="inline inventory__present-col inv-present">Present</p>
-            <p class="inline inventory__state-col inventory__critical-label">High - Emergency</p>
-        </a>
-        <a class="inventory__group" href="">
-            <p class="inline inventory__device-col"><span class="inline priority-tag-circ normal-priority" aria-label="Normal Priority"></span>DIMM (4)</p>
-            <p class="inline inventory__function-col inv-active">Active</p>
-            <p class="inline inventory__present-col inv-present">Present</p>
-            <p class="inline inventory__state-col">&nbsp;</p>
-        </a>
-        <a class="inventory__group" href="">
-            <p class="inline inventory__device-col"><span class="inline priority-tag-circ warn-priority" aria-label="Warning Priority"></span>Fan (5)</p>
-            <p class="inline inventory__function-col inv-active">Active</p>
-            <p class="inline inventory__present-col inv-present">Present</p>
-            <p class="inline inventory__state-col inventory__warning-label">Medium - Warning</p>
-        </a>
-        <a class="inventory__group" href="">
-            <p class="inline inventory__device-col"><span class="inline priority-tag-circ normal-priority"></span>Chasis (3)</p>
-            <p class="inline inventory__function-col inv-active">Active</p>
-            <p class="inline inventory__present-col inv-present">Present</p>
-            <p class="inline inventory__state-col">&nbsp;</p>
-        </a>
-        <a class="inventory__group" href="">
-            <p class="inline inventory__device-col"><span class="inline priority-tag-circ normal-priority" aria-label="Normal Priority"></span>BMC (5)</p>
-            <p class="inline inventory__function-col inv-active">Active</p>
-            <p class="inline inventory__present-col inv-present">Present</p>
-            <p class="inline inventory__state-col">&nbsp;</p>
-        </a>
-        <a class="inventory__group" href="">
-            <p class="inline inventory__device-col"><span class="inline priority-tag-circ medium-priority " aria-label="MediumPriority"></span>MISC (5)</p>
-            <p class="inline inventory__function-col inv-inactive">Inactive</p>
-            <p class="inline inventory__present-col inv-present">Present</p>
-            <p class="inline inventory__state-col inventory__medium-label">Medium - Error</p>
-        </a>
-        <a class="inventory__group inv-disabled">
-            <p class="inline inventory__device-col"><span class="inline priority-tag-circ disabled" aria-label="Low Priority"></span>PCIE card (0)</p>
-            <p class="inline inventory__function-col inv-inactive">Inactive</p>
-            <p class="inline inventory__present-col inv-not-present">Not Present</p>
-        </a>
-    </section>
+<div class="inventory-overview">
+	<div class="row column no-padding">
+		<h1>Hardware status</h1>
+		<div class="page-header">
+			<button class="inline btn-export float-right">Export</button>
+		</div>
+	</div>
+	<section class="row column">
+		<!-- search -->
+		<div class="content__search">
+			<label for="content__search-input">Search</label> <input id="content__search-input" type="text"
+				placeholder="Filter hardware components"/>
+			<input id="content__search-submit" type="submit" class="btn btn-primary" value="Filter"/>
+		</div>
+
+	</section>
+	<!-- end search -->
+	<section id="inventory-categories" class="row column">
+		<div class="row column header-row">
+			<div class="column large-12 header__actions-bar">
+				<div class="inline inventory__heading inventory__device-col">Hardware</div>
+				<div class="inline inventory__heading inventory__function-col">&nbsp;</div>
+				<div class="inline inventory__heading inventory__assoc-event sort-heading sort-down">Associated events</div>
+			</div>
+		</div>
+		<!-- hardware item -->
+		<div class="inventory__group" ng-class="{'active': inv.meta}" ng-click="inv.meta = ! inv.meta">
+			<p class="inline inventory__device-col">System</p>
+			<p class="inline inventory__function-col"></p>
+			<p class="inline inventory__assoc-event"></p>
+			<button class="accord-trigger float-right" ng-class="{'active': inv.meta}" ng-click="inv.meta = ! inv.meta"></button>
+			<div class="row inventory__metadata" ng-class="{'active': inv.meta}">
+				<div class="column large-9 no-padding">
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Name</p>
+						<p class="courier-bold">System</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Serial Number</p>
+						<p class="courier-bold">2230123ab-04</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Part Number</p>
+						<p class="courier-bold">12355123ab</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Manufacturer</p>
+						<p class="courier-bold">IBM</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Version</p>
+						<p class="courier-bold">10</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Functional</p>
+						<p class="courier-bold">Yes</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Field replaceable</p>
+						<p class="courier-bold">Not replaceable</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Higher level FRU</p>
+						<p class="courier-bold">Motherboard</p>
+					</div>
+				</div>
+				<div class="column large-3">
+
+				</div>
+			</div>
+		</div>
+
+		<!-- hardware item -->
+		<div class="inventory__group">
+			<p class="inline inventory__device-col">Chassis</p>
+			<p class="inline inventory__function-col"></p>
+			<p class="inline inventory__assoc-event"></p>
+			<button class="accord-trigger float-right"></button>
+			<div class="row inventory__metadata">
+				<div class="column large-9 no-padding">
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Name</p>
+						<p class="courier-bold">Processor module</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Serial Number</p>
+						<p class="courier-bold">2230123ab-04</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Part Number</p>
+						<p class="courier-bold">12355123ab</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Manufacturer</p>
+						<p class="courier-bold">IBM</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Version</p>
+						<p class="courier-bold">10</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Functional</p>
+						<p class="courier-bold">Yes</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Field replaceable</p>
+						<p class="courier-bold">Not replaceable</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Higher level FRU</p>
+						<p class="courier-bold">Motherboard</p>
+					</div>
+				</div>
+				<div class="column large-3 no-padding">
+				</div>
+			</div>
+		</div>
+		<!-- hardware item -->
+		<div class="inventory__group ">
+			<p class="inline inventory__device-col">Motherboard</p>
+			<p class="inline inventory__function-col"></p>
+			<p class="inline inventory__assoc-event"></p>
+			<button class="accord-trigger float-right"></button>
+			<div class="row inventory__metadata ">
+				<div class="column large-9 no-padding">
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Name</p>
+						<p class="courier-bold">Processor module</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Serial Number</p>
+						<p class="courier-bold">2230123ab-04</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Part Number</p>
+						<p class="courier-bold">12355123ab</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Manufacturer</p>
+						<p class="courier-bold">IBM</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Version</p>
+						<p class="courier-bold">10</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Functional</p>
+						<p class="courier-bold">Yes</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Field replaceable</p>
+						<p class="courier-bold">Not replaceable</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Higher level FRU</p>
+						<p class="courier-bold">Motherboard</p>
+					</div>
+				</div>
+				<div class="column large-3 no-padding">
+
+				</div>
+			</div>
+		</div>
+		<!-- hardware item w/ sub categories -->
+		<div class="inventory__group"  ng-class="{'active': inv2.meta}" ng-click="inv2.meta = ! inv2.meta">
+			<p class="inline inventory__device-col">CPU 0</p>
+			<p class="inline inventory__function-col"></p>
+			<p class="inline inventory__assoc-event"><a href="#/server-health/event-log">View 3 events</a></p>
+			<button class="accord-trigger float-right" ng-class="{'active': inv2.meta}" ng-click="inv2.meta = ! inv2.meta"></button>
+			<div class="row inventory__metadata" ng-class="{'active': inv2.meta}">
+				<div class="column large-9 no-padding">
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Name</p>
+						<p class="courier-bold">Processor module</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Serial Number</p>
+						<p class="courier-bold">2230123ab-04</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Part Number</p>
+						<p class="courier-bold">12355123ab</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Manufacturer</p>
+						<p class="courier-bold">IBM</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Version</p>
+						<p class="courier-bold">10</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Functional</p>
+						<p class="courier-bold">Yes</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Field replaceable</p>
+						<p class="courier-bold">Not replaceable</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Higher level FRU</p>
+						<p class="courier-bold">Motherboard</p>
+					</div>
+				</div>
+				<div class="column large-3 no-padding">
+					<div class="inventory__metadata-scroll show-scroll"> <!-- If content overflows; add 'show-scroll' class via JS to force visible scrollbar in webkit browsers-->
+						<div class="content-label">Subcomponents</div>
+						<div class="inline inventory__metadata-block">
+							<p class="courier-bold">Core 0</p>
+						</div>
+						<div class="inline inventory__metadata-block">
+							<p class="courier-bold"><span class="icon icon__warning"></span>Core 1</p>
+						</div>
+						<div class="inline inventory__metadata-block">
+							<p class="courier-bold">Core 2</p>
+						</div>
+						<div class="inline inventory__metadata-block">
+							<p class="courier-bold">Core 3</p>
+						</div>
+						<div class="inline inventory__metadata-block">
+							<p class="courier-bold">Core 4</p>
+						</div>
+						<div class="inline inventory__metadata-block">
+							<p class="courier-bold">Core 5</p>
+						</div>
+						<div class="inline inventory__metadata-block">
+							<p class="courier-bold">Core 6</p>
+						</div>
+						<div class="inline inventory__metadata-block">
+							<p class="courier-bold">Core 7</p>
+						</div>
+						<div class="inline inventory__metadata-block">
+							<p class="courier-bold">Core 8</p>
+						</div>
+						<div class="inline inventory__metadata-block">
+							<p class="courier-bold">Core 9</p>
+						</div>
+						<div class="inline inventory__metadata-block">
+							<p class="courier-bold">Core 10</p>
+						</div>
+						<div class="inline inventory__metadata-block">
+							<p class="courier-bold">Core 11</p>
+						</div>
+						<div class="inline inventory__metadata-block">
+							<p class="courier-bold">Core 12</p>
+						</div>
+						<div class="inline inventory__metadata-block">
+							<p class="courier-bold">Core 13</p>
+						</div>
+						<div class="inline inventory__metadata-block">
+							<p class="courier-bold">Core 14</p>
+						</div>
+						<div class="inline inventory__metadata-block">
+							<p class="courier-bold">Core 15</p>
+						</div>
+						<div class="inline inventory__metadata-block">
+							<p class="courier-bold">Core 16</p>
+						</div>
+						<div class="inline inventory__metadata-block">
+							<p class="courier-bold">Core 17</p>
+						</div>
+						<div class="inline inventory__metadata-block">
+							<p class="courier-bold">Core 18</p>
+						</div>
+						<div class="inline inventory__metadata-block">
+							<p class="courier-bold">Core 19</p>
+						</div>
+						<div class="inline inventory__metadata-block">
+							<p class="courier-bold">Core 20</p>
+						</div>
+						<div class="inline inventory__metadata-block">
+							<p class="courier-bold">Core 21</p>
+						</div>
+						<div class="inline inventory__metadata-block">
+							<p class="courier-bold">Core 22</p>
+						</div>
+						<div class="inline inventory__metadata-block">
+							<p class="courier-bold">Core 23</p>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!-- hardware item -->
+		<div class="inventory__group ">
+			<p class="inline inventory__device-col">Ethernet</p>
+			<p class="inline inventory__function-col">Inactive</p>
+			<p class="inline inventory__assoc-event"><a href="#/server-health/event-log">View 1 event</a></p>
+			<button class="accord-trigger float-right"></button>
+			<div class="row inventory__metadata ">
+				<div class="column large-9 no-padding">
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Name</p>
+						<p class="courier-bold">Processor module</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Serial Number</p>
+						<p class="courier-bold">2230123ab-04</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Part Number</p>
+						<p class="courier-bold">12355123ab</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Manufacturer</p>
+						<p class="courier-bold">IBM</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Version</p>
+						<p class="courier-bold">10</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Functional</p>
+						<p class="courier-bold">Yes</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Field replaceable</p>
+						<p class="courier-bold">Not replaceable</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Higher level FRU</p>
+						<p class="courier-bold">Motherboard</p>
+					</div>
+				</div>
+				<div class="column large-3 no-padding"></div>
+			</div>
+		</div>
+		<!-- hardware item no sub items -->
+		<div class="inventory__group inv-disabled">
+			<p class="inline inventory__device-col">DIMM 0</p>
+			<p class="inline inventory__function-col">Not present</p>
+			<p class="inline inventory__assoc-event"></p>
+			<button class="accord-trigger float-right"></button>
+			<div class="row inventory__metadata ">
+				<div class="column large-9 no-padding">
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Name</p>
+						<p class="courier-bold">Processor module</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Serial Number</p>
+						<p class="courier-bold">2230123ab-04</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Part Number</p>
+						<p class="courier-bold">12355123ab</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Manufacturer</p>
+						<p class="courier-bold">IBM</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Version</p>
+						<p class="courier-bold">10</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Functional</p>
+						<p class="courier-bold">Yes</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Field replaceable</p>
+						<p class="courier-bold">Not replaceable</p>
+					</div>
+					<div class="inline inventory__metadata-block">
+						<p class="content-label">Higher level FRU</p>
+						<p class="courier-bold">Motherboard</p>
+					</div>
+				</div>
+				<div class="column large-3 no-padding"></div>
+			</div>
+		</div>
+	</section>
 </div>
\ No newline at end of file