diff --git a/css/main.css b/css/main.css
index a3ec05f94b9c527bde0ddde30ce533cf9261b177..1982f69938b9512d84c077cba683efdfa17ebf08 100644
--- a/css/main.css
+++ b/css/main.css
@@ -209,10 +209,10 @@ hr {
     background-color: rgba(255, 255, 0, 0.35);
 }
 
-.postWarning {
+.inlineWarning {
     background-color: rgba(255,0,0,0.15);
     padding: 10px 15px 15px 15px;
-    margin: 20px 0;
+    margin: 0 0 20px 0;
 }
 
 input.intInput, input.floatInput{
@@ -434,12 +434,25 @@ label {
 .voltageInput, .voltageInput:focus{
     border-color: #f4d313;
 }
+.capacitance{
+    background: #f4d313;
+}
 
 .currentInput, .currentInput:focus{
     border-color: #58d68d;
 }
+.inductance{
+    background: #58d68d;
+}
 
 .voltageInput, .currentInput {
     margin-left: 15px;
     width: 30%!important;
+}
+
+.inlineSwatch{
+    height: 15px;
+    width: 15px;
+    display: inline-block;
+    margin-right: 10px;
 }
\ No newline at end of file
diff --git a/js/menus/EStaticMenuView.js b/js/menus/EStaticMenuView.js
index 46b727704ea73b3a88a56c1a75a4933385c93aba..50b25b7b9d203e8afad1a2cda3316ffc2bbcf42b 100644
--- a/js/menus/EStaticMenuView.js
+++ b/js/menus/EStaticMenuView.js
@@ -17,6 +17,7 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'text!eStaticMenuTemplate
 
         getPropertyOwner: function($target){
             if ($target.hasClass("eSim")) return eSim;
+            if ($target.hasClass("eSimGroup")) return eSim.get("conductorGroups")[$target.data("index")];
             return null;
         },
 
diff --git a/js/menus/templates/AnimationMenuView.html b/js/menus/templates/AnimationMenuView.html
index e98c5321307694d23be582f81dcde19aec375f31..6d53cb157a93fdc41c2bcff883707bd312895b11 100644
--- a/js/menus/templates/AnimationMenuView.html
+++ b/js/menus/templates/AnimationMenuView.html
@@ -12,7 +12,7 @@
 <a href="#" id="animationMenuSave" class=" btn btn-block btn-lg btn-default">Save</a><br/>
 <!--Assembly Time:&nbsp;&nbsp;<br/><br/>-->
 <% if (editsMadeToProgram && needsPostProcessing){ %>
-    <div class="postWarning">You have made the following changes that require post processing:<br/>
+    <div class="inlineWarning">You have made the following changes that require post processing:<br/>
     This will override edits you have made to the G-code.  OK to override? <a href="#" class="overrideEdits btn btn-block btn-lg btn-danger">OK</a></div>
 <% } %>
 <div id="gcodeEditor"><%= dataOut %></div><br/>
diff --git a/js/menus/templates/ESetupMenuView.html b/js/menus/templates/ESetupMenuView.html
index 155d7837062c3d8355c2d001433e0f54906fb73e..a897a6387ab18c5611aec091681836cc3f9ab5fb 100644
--- a/js/menus/templates/ESetupMenuView.html
+++ b/js/menus/templates/ESetupMenuView.html
@@ -1,5 +1,5 @@
 <% if (overlapDetected) { %>
-    <div class="postWarning">Overlapping cells detected, check that hierarchical cells are not placed on top of one another.  Simulation results may be inaccurate.</div>
+    <div class="inlineWarning">Overlapping cells detected, check that hierarchical cells are not placed on top of one another.  Simulation results may be inaccurate.</div>
 <% } %>
 Simulation Type: &nbsp;&nbsp;
     <div class="btn-group">
diff --git a/js/menus/templates/EStaticMenuView.html b/js/menus/templates/EStaticMenuView.html
index 0dda46b2587910037a8c424677a44d2d66404eb7..1e2c04a1c2d15a962043ae552d03644d684008f1 100644
--- a/js/menus/templates/EStaticMenuView.html
+++ b/js/menus/templates/EStaticMenuView.html
@@ -7,12 +7,12 @@
         <label class="radio">
             <input type="radio" <% if (groupData.id == visibleConductorGroup){ %>checked<% } %> name="visibleConductorGroup" value="<%= groupData.id %>" data-toggle="radio" class="custom-radio eSim"><span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span>
             Group <%= index + 1 %>
-            <input data-property="voltage" value="<%= groupData.voltage %>" placeholder="Voltage" class="form-control floatInput eSim voltageInput" type="text">
-            <input data-property="current" value="<%= groupData.current %>" placeholder="Current" class="form-control floatInput eSim currentInput" type="text">
+            <input data-property="voltage" data-index="<%= index %>" value="<%= groupData.voltage %>" placeholder="Voltage" class="form-control floatInput eSimGroup voltageInput" type="text">
+            <input data-property="current" data-index="<%= index %>" value="<%= groupData.current %>" placeholder="Current" class="form-control floatInput eSimGroup currentInput" type="text">
         </label>
-    <% }); %>
-<% } %>
-
-Capacitance:<br/>
-
-Inductance:<br/>
\ No newline at end of file
+    <% }); %><br/>
+    <div class="inlineSwatch capacitance"></div>Capacitance:<br/><br/>
+    <div class="inlineSwatch inductance"></div>Inductance:<br/>
+<% } else { %>
+    <div class="inlineWarning">No conductive groups detected, please navigate to previous tab and calculate.</div>
+<% } %>
\ No newline at end of file
diff --git a/js/menus/templates/SetupCommMenuView.html b/js/menus/templates/SetupCommMenuView.html
index ee5e37c1120656745021c08afbcb204e94b7d370..a3135c6fe366f635edbaffb3bdc5f4c79d25e0ff 100644
--- a/js/menus/templates/SetupCommMenuView.html
+++ b/js/menus/templates/SetupCommMenuView.html
@@ -1,5 +1,5 @@
 <% if(error){ %>
-    <div class="postWarning"><%= error %></div>
+    <div class="inlineWarning"><%= error %></div>
 <% } %>
 <% if(connected){ %>
     Status: &nbsp;&nbsp;<% if (portConnected){ %> Connected <% } else { %> <span class="red">Disconnected</span> <% } %><br/><br/>