diff --git a/configuration/pih/htmlforms/triage.xml b/configuration/pih/htmlforms/triage.xml
index 72aa6f40..56cf2eaa 100644
--- a/configuration/pih/htmlforms/triage.xml
+++ b/configuration/pih/htmlforms/triage.xml
@@ -85,6 +85,11 @@
             width: 25%;
         }
 
+        .five-columns > div {
+            display: table-cell;
+            width: 20%;
+        }
+
         .boundary {
             margin-bottom: 6px;
             border-bottom: 1px solid #ccc;
@@ -119,6 +124,25 @@
             display: inline-block;
         }
 
+        .list-inline label, .list-inline input[type="radio"], .list-inline span,
+        .list-inline-wide label, .list-inline-wide input[type="radio"], .list-inline-wide span,
+        .list-inline-extra-wide label, .list-inline-extra-wide input[type="radio"], .list-inline-extra-wide span {
+            display: inline-block;
+            float: none;
+        }
+
+        .list-inline label:first-child {
+            width: 220px;
+        }
+
+        .list-inline-wide label:first-child {
+            width: 320px;
+        }
+
+        .list-inline-extra-wide label:first-child {
+            width: 420px;
+        }
+
         .vitals span, .complaint span {
             float: none;
             display: inline-block;
@@ -576,21 +600,27 @@
             </div>
     </ifMode>
 
-    <div class="vitals">
-        <p class="side-by-side">
-            <label>
-                <uimessage code="Gestational age(weeks)"/>:&amp;nbsp;&amp;nbsp;
-            </label>
-            <obs conceptId="CIEL:165425" id="gestationalAge"/>
-            <label>&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;
-                <uimessage code="pihcore.mch.grava"/>:&amp;nbsp;&amp;nbsp;
-            </label>
-            <obs conceptId="CIEL:5624" id="gravida"/>
-            <label>&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;
-                <uimessage code="pihcore.mch.para"/>:&amp;nbsp;&amp;nbsp;
-            </label>
-            <obs conceptId="CIEL:1053" id="para"/>
-        </p>
+    <div class="vitals two-columns">
+        <div>
+            <p class="side-by-side">
+                <label>
+                    <uimessage code="Gestational age (weeks)"/>:&amp;nbsp;&amp;nbsp;
+                </label>
+                <obs conceptId="CIEL:165425" id="gestationalAge"/>
+            </p>
+        </div>
+        <div>
+            <p class="side-by-side">
+                <label>
+                    <uimessage code="pihcore.mch.grava"/>:&amp;nbsp;&amp;nbsp;
+                </label>
+                <obs conceptId="CIEL:5624" id="gravida"/>
+                <label>&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;
+                    <uimessage code="pihcore.mch.para"/>:&amp;nbsp;&amp;nbsp;
+                </label>
+                <obs conceptId="CIEL:1053" id="para"/>
+            </p>
+        </div>
     </div>
 
     <div class="complaint">
@@ -657,16 +687,16 @@
             <h3 class="panel-title">Evaluation</h3>
         </div>
         <div>
-            <h3 class="panel-title header-col">Normal
-                (Green: 4 hours)</h3>
+            <h5 class="panel-title header-col">Normal
+                (Green: 4 hours)</h5>
         </div>
         <div>
-            <h3 class="panel-title header-col">Urgent
-                (Yellow: 30 minutes)</h3>
+            <h5 class="panel-title header-col">Urgent
+                (Yellow: 30 minutes)</h5>
         </div>
         <div>
-            <h3 class="panel-title header-col">Emergency
-            (Red: Immediately)</h3>
+            <h5 class="panel-title header-col">Emergency
+            (Red: Immediately)</h5>
         </div>
     </div>
 
@@ -768,7 +798,7 @@
 
     <div class="boundary"></div>
     
-    <p class="side-by-side">
+    <p class="list-inline">
         <label>
             <uimessage code="Other complaints:" />
         </label>
@@ -783,7 +813,8 @@
         </obs>
         <obs conceptId="PIH:14679" id="other-complain" style="text"/>
     </p>
-    <div class="ebolaDiv">
+
+    <div class="ebolaDiv exam">
         <p class="side-by-side">
             <label>
                 <uimessage code="Ebola Screen:" />
@@ -802,28 +833,36 @@
             </repeat>
         </p>
     </div>
-    <div class="tbScreen">
-        <label>
-            <uimessage code="pihcore.tbscreen.title"/> <ifMode mode="VIEW" include="false"><font style="color:red">(required)</font> If at least two questions answers yes</ifMode>
-        </label>
+
+
+    <label>
+        <uimessage code="pihcore.tbscreen.title"/>: <ifMode mode="VIEW" include="false"><font style="color:red">(required)</font> If 2+ symptoms, patient isolation and urgent care.</ifMode>
+    </label>
+    <div class="tbScreen five-columns">
+        <div></div>
         <repeat with="['Cough > 2 weeks','11567'], ['Fever','5945'], ['Night Sweat','6029'],['Weight Loss','6477']">
-            <p class="side-by-side">
+            <div>
+            <p class="list-inline" >
                 <!-- TB symptom -->
-                <label><uimessage code="{0}"/>:&amp;nbsp;&amp;nbsp;</label>
+                <label><uimessage code="{0}"/></label>
+                <br/>
                 <obs conceptIds="PIH:11563,PIH:11564"
                      style="radio"
                      answerConceptId="PIH:{1}"
                      conceptLabels="Yes, No"
                      labelText=""/>
             </p>
+            </div>
         </repeat>
     </div>
+
     <div>
         <span id="isolationMsg" >Patient needs isolation and urgent review by infectious disease team.</span>
     </div>
+
     <div class="boundary"></div>
     <div class="referralService">
-        <p class="side-by-side">
+        <p class="list-inline">
             <label>
                 <uimessage code="Any Red/Yellow Emergency:" />
             </label>
@@ -834,7 +873,7 @@
                  answerCodes="Pre-Op/PACU,Labour and Delivery,MCCU"/>
         </p>
 
-        <p class="side-by-side">
+        <p class="list-inline">
             <label>
                 <uimessage code="Green/No Emergency:" />
             </label>