diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss
index b4352f413d..fea72f4573 100644
--- a/cms/static/sass/views/_unit.scss
+++ b/cms/static/sass/views/_unit.scss
@@ -438,24 +438,23 @@ body.course.unit {
       @include edit-box;
       @include box-shadow(none);
       display: none;
-      padding: 20px;
+      padding: 0;
       border-radius: 2px 2px 0 0;
 
-
       // Edit Menu (Component Name, Mode-Editor, Mode-Settings)
 
       .component-edit-menu {
         @include box-sizing(border-box);
         position: absolute;
         width: 100%;
-        padding: 15px;
+        //padding: 15px;
         top: 0;
         right: 0;
         border-bottom: 1px solid $lightBluishGrey2;
-        background: $lightGrey;
+        background: $gray-l4;
 
         //Component Name
-        h3 {
+        h4 {
           //TO-DO 
           //determine proper h-level
         }
@@ -463,11 +462,11 @@ body.course.unit {
         //Nav-Edit Modes
         .nav-edit-modes {
           list-style: none;
-          //move to the right,
 
           li {
             //TO-DO
             //inherit button styling
+            float: right;
             //no idea what it currently inherits...
 
             &:hover {
diff --git a/cms/templates/component.html b/cms/templates/component.html
index 14406dfa3a..72c7df2845 100644
--- a/cms/templates/component.html
+++ b/cms/templates/component.html
@@ -28,13 +28,13 @@
 		  			<button type="button" name="setting-clear" value="Clear" class="setting-clear " data-tooltip="Clear">
 		  				<i class="ss-icon ss-symbolicons-block undo">&#x21A9;</i>
 		  			</button>
-		  			<span class="settings-help">${helpstring}</span>
+		  			<span class="settings-help">helpstring</span>
 		  		</li>
 		  		<!--% showing second example mostly to see is-set style difference -->
 		  		<li class="settings-row">
 		  			<label for="setting-name-as-id">Setting Display Name Goes Here</label>
 		  			<input type="type2" id="firstname"/> 
-		  			<span class="settings-help">${helpstring}</span>
+		  			<span class="settings-help">helpstring</span>
 		  		
 		  		<!--% showing dropdown example -->
 		  		<li class="settings-row">