diff --git a/content/hub/oregonstateuniversity.md b/content/hub/oregonstateuniversity.md
index d828c3f..01ebdd1 100644
--- a/content/hub/oregonstateuniversity.md
+++ b/content/hub/oregonstateuniversity.md
@@ -7,8 +7,10 @@ provides:
   - Bare Metal
   - Virtual Machine
   - Container
-  - GPU
-  - FPGA
+addons:
+  - none
+  - GPU (vm)
+  - FPGA (container)
 systems:
   - POWER9
   - POWER8
diff --git a/content/hub/raptorcomputingsystems.md b/content/hub/raptorcomputingsystems.md
index c4885a2..57ccb79 100644
--- a/content/hub/raptorcomputingsystems.md
+++ b/content/hub/raptorcomputingsystems.md
@@ -9,6 +9,9 @@ provides:
   - Virtual Machine
   - Container
   - FPGA
+addons:
+  - none
+  - FPGA
 systems:
   - POWER9
 operatingsystems:
diff --git a/content/hub/universityoforegon.md b/content/hub/universityoforegon.md
index fac0aa0..6a0b993 100644
--- a/content/hub/universityoforegon.md
+++ b/content/hub/universityoforegon.md
@@ -4,8 +4,12 @@ member: universityoforegon
 projects:
   - Open Source
 provides:
+  - Bare Metal Machine
   - Virtual Machine
   - Container
+  - FPGA
+addons:
+  - none
   - GPU
   - FPGA
 systems:
diff --git a/content/hub/vantosh.md b/content/hub/vantosh.md
index f3dc4b0..cd4d24b 100644
--- a/content/hub/vantosh.md
+++ b/content/hub/vantosh.md
@@ -8,7 +8,11 @@ provides:
   - Virtual Machines
   - FPGA
   - Containers
-  - LibreBMC
+addons:
+  - none
+  - GPU (vm)
+  - FPGA (vm)
+  - LibreBMC (POWER9)
 systems:
   - POWER9
   - POWER8
diff --git a/themes/openpowerfoundation/assets/css/pages.scss b/themes/openpowerfoundation/assets/css/pages.scss
index c240614..31d14c9 100644
--- a/themes/openpowerfoundation/assets/css/pages.scss
+++ b/themes/openpowerfoundation/assets/css/pages.scss
@@ -223,6 +223,14 @@ section#steeringcomittee {
 			font-size: 14px;
 		}
 	}
+	.operatingsystsms ul {
+		list-style-type: disc;
+	}
+	.operatingsystems ul li {
+		display: inline;
+		padding-left: 1rem;
+		padding-right: 1rem;
+	}
 }
 
 
diff --git a/themes/openpowerfoundation/layouts/hub/single.html b/themes/openpowerfoundation/layouts/hub/single.html
index e7c02de..1276784 100644
--- a/themes/openpowerfoundation/layouts/hub/single.html
+++ b/themes/openpowerfoundation/layouts/hub/single.html
@@ -57,12 +57,12 @@
 				</div>
 			{{ end }}
 			<div class="col-lg-4">&nbsp;</div>
-			{{ if .Param "operatingsystems" }}
+			{{ if .Param "addons" }}
 				<div class="col-lg-4">
-					Operating Systems :
+					Resource Addons :
 					<ul>
-					{{ range $s := .Param "operatingsystems" }}
-						<li>{{ $s }}</li>
+					{{ range $a := .Param "addons" }}
+						<li>{{ $a }}</li>
 					{{ end }}
 					</ul>
 				</div>
@@ -77,6 +77,17 @@
 					</ul>
 				</div>
 			{{ end }}
+			<div class="col-lg-4">&nbsp;</div>
+			{{ if .Param "operatingsystems" }}
+				<div class="col-lg-8 operatingsystems">
+					Operating Systems :
+					<ul class="operatingsystems">
+					{{ range $s := .Param "operatingsystems" }}
+						<li class="operatingsystems">{{ $s }}</li>
+					{{ end }}
+					</ul>
+				</div>
+			{{ end }}
 		</div>
 	</div>
 	{{ if .Content }}
diff --git a/themes/openpowerfoundation/layouts/partials/hubform.html b/themes/openpowerfoundation/layouts/partials/hubform.html
index 1f113e5..ee99e84 100644
--- a/themes/openpowerfoundation/layouts/partials/hubform.html
+++ b/themes/openpowerfoundation/layouts/partials/hubform.html
@@ -7,8 +7,8 @@ var goal = "{{ .Site.Params.forms.hub.goal }}";
 {{ end }}
 </script>
 <section id="hub">
-<div class="container">	<div class="row wow fadeInUp">
-	<div class="col-lg-8 offset-lg-2 col-md-12 mt-5 mb-5"><div class="form">
+<div class="container"><div class="row wow fadeInUp">
+	<div class="col-lg-12 col-md-12 mt-5 mb-5"><div class="form">
 		<div class="col-lg-12 text-center"><h2>HUB Access Request Form</h2></div>
 		<div id="sendmessage" style="display:none">Your request has been sent. Thank you!</div>
 		<div id="errormessage" style="display:none">Error</div>
@@ -43,58 +43,63 @@ var goal = "{{ .Site.Params.forms.hub.goal }}";
 					<div class="validation"></div>
 				</div>
 			</div>
+			<div class="form-row">
 			{{ $projects := .Param "projects" }}
 			{{ if $projects }}
-				<div><h3>What is your project?</h3></div>
-				<div class="form-row">
-					<div class="form-group col-lg-12">
-						<select id="project" name="project">
-						{{ range $projects }}
-							<option value="{{ . }}">{{ . }}</option>
-						{{ end }}
-						</select>
-					</div>
+				<div class="form-group col-lg-6">
+					What is your project?
+					<select id="project" name="project">
+					{{ range $projects }}
+						<option value="{{ . }}">{{ . }}</option>
+					{{ end }}
+					</select>
 				</div>
 			{{ end }}
 			{{ $systems := .Param "systems" }}
 			{{ if $systems }}
-				<div><h3>What POWER system would you like?</h3></div>
-				<div class="form-row">
-					<div class="form-group col-lg-6">
-						<select id="system" name="system">
-						{{ range $systems }}
-							<option value="{{ . }}">{{ . }}</option>
-						{{ end }}
-						</select>
-					</div>
+				<div class="form-group col-lg-6">
+					What POWER system would you like?
+					<select id="system" name="system">
+					{{ range $systems }}
+						<option value="{{ . }}">{{ . }}</option>
+					{{ end }}
+					</select>
 				</div>
 			{{ end }}
 			{{ $provides := .Param "provides" }}
 			{{ if $provides }}
-				<div><h3>What POWER resources do you require?</h3></div>
-				<div class="form-row">
-					<div class="form-group col-lg-6">
-						<select id="provides" name="provides">
-						{{ range $provides }}
-							<option value="{{ . }}">{{ . }}</option>
-						{{ end }}
-						</select>
-					</div>
+				<div class="form-group col-lg-6">
+					What POWER resources do you require?
+					<select id="provides" name="provides">
+					{{ range $provides }}
+						<option value="{{ . }}">{{ . }}</option>
+					{{ end }}
+					</select>
+				</div>
+			{{ end }}
+			{{ $addons := .Param "addons" }}
+			{{ if $addons }}
+				<div class="form-group col-lg-6">
+					What POWER addons do you require?
+					<select id="addons" name="addons">
+					{{ range $addons }}
+						<option value="{{ . }}">{{ . }}</option>
+					{{ end }}
+					</select>
 				</div>
 			{{ end }}
 			{{ $operatingsystems := .Param "operatingsystems" }}
 			{{ if $operatingsystems }}
-				<div><h3>What Operating System would you like on your POWER resource?</h3></div>
-				<div class="form-row">
-					<div class="form-group col-lg-6">
-						<select id="operatingsystem" name="operatingsystem">
-						{{ range $operatingsystems }}
-							<option value="{{ . }}">{{ . }}</option>
-						{{ end }}
-						</select>
-					</div>
+				<div class="form-group col-lg-12">
+					What Operating System would you like on your POWER resource?
+					<select id="operatingsystem" name="operatingsystem">
+					{{ range $operatingsystems }}
+						<option value="{{ . }}">{{ . }}</option>
+					{{ end }}
+					</select>
 				</div>
 			{{ end }}
+			</div>
 			<div class="form-group">
 				<textarea class="form-control" name="message" rows="5" data-rule="required" data-msg="Please write a short explanation about getting access. (Why, How, Whatfor, how long)" placeholder="Please write a short explanation about getting access. (Why, How, Whatfor, how long)"></textarea>
 				<div class="validation"></div>