diff --git a/cms/static/client_templates/advanced_entry.html b/cms/static/client_templates/advanced_entry.html
index 6be22e2116..0a24be0f49 100644
--- a/cms/static/client_templates/advanced_entry.html
+++ b/cms/static/client_templates/advanced_entry.html
@@ -1,3 +1,4 @@
+<%! from django.utils.translation import ugettext as _ %>
 <li class="field-group course-advanced-policy-list-item">
 	<div class="field is-not-editable text key" id="<%= key %>">
 		<label for="<%= keyUniqueId %>">Policy Key:</label>
@@ -5,7 +6,7 @@
   </div>
   
   <div class="field text value">
-    <label for="<%= valueUniqueId %>">Policy Value:</label>
+    <label for="<%= valueUniqueId %>">${_("Policy Value:")}</label>
     <textarea class="json text" id="<%= valueUniqueId %>"><%= value %></textarea>
   </div>
 </li>
\ No newline at end of file
diff --git a/cms/static/client_templates/metadata_number_entry.html b/cms/static/client_templates/metadata_number_entry.html
index df534135c7..5629b212dc 100644
--- a/cms/static/client_templates/metadata_number_entry.html
+++ b/cms/static/client_templates/metadata_number_entry.html
@@ -1,8 +1,9 @@
+<%! from django.utils.translation import ugettext as _ %>
 <div class="wrapper-comp-setting">
 	<label class="label setting-label" for="<%= uniqueId %>"><%= model.get('display_name') %></label>
 	<input class="input setting-input" type="number" id="<%= uniqueId %>" value='<%= model.get("value") %>' onkeyup="checkNumberSettingValidity(this);"/>
-	<button class="action setting-clear inactive" type="button" name="setting-clear" value="Clear" data-tooltip="Clear">
-		<i class="ss-icon ss-symbolicons-block undo">&#x21A9;</i><span class="sr">Clear Value</span>
+	<button class="action setting-clear inactive" type="button" name="setting-clear" value="${_("Clear")}" data-tooltip="${_("Clear")}">
+		<i class="ss-icon ss-symbolicons-block undo">&#x21A9;</i><span class="sr">${_("Clear Value")}</span>
 	</button>
 </div>
 <span class="tip setting-help"><%= model.get('help') %></span>
diff --git a/cms/static/client_templates/metadata_option_entry.html b/cms/static/client_templates/metadata_option_entry.html
index d2053e497a..409bb94595 100644
--- a/cms/static/client_templates/metadata_option_entry.html
+++ b/cms/static/client_templates/metadata_option_entry.html
@@ -1,3 +1,4 @@
+<%! from django.utils.translation import ugettext as _ %>
 <div class="wrapper-comp-setting">
     <label class="label setting-label" for="<%= uniqueId %>"><%= model.get('display_name') %></label>
     <select class="input setting-input" id="<%= uniqueId %>" name="<%= model.get('display_name') %>">
@@ -9,8 +10,8 @@
             <% } %>
         <% }) %>
     </select>
-    <button class="action setting-clear inactive" type="button" name="setting-clear" value="Clear" data-tooltip="Clear">
-        <i class="ss-icon ss-symbolicons-block undo">&#x21A9;</i><span class="sr">Clear Value</span>
+    <button class="action setting-clear inactive" type="button" name="setting-clear" value="${_("Clear")}" data-tooltip="${_("Clear")}">
+        <i class="ss-icon ss-symbolicons-block undo">&#x21A9;</i><span class="sr">${_("Clear Value")}</span>
     </button>
 </div>
 <span class="tip setting-help"><%= model.get('help') %></span>
diff --git a/cms/static/client_templates/metadata_string_entry.html b/cms/static/client_templates/metadata_string_entry.html
index 74d64d58af..bbad43f979 100644
--- a/cms/static/client_templates/metadata_string_entry.html
+++ b/cms/static/client_templates/metadata_string_entry.html
@@ -1,8 +1,9 @@
+<%! from django.utils.translation import ugettext as _ %>
 <div class="wrapper-comp-setting">
 	<label class="label setting-label" for="<%= uniqueId %>"><%= model.get('display_name') %></label>
 	<input class="input setting-input" type="text" id="<%= uniqueId %>" value='<%= model.get("value") %>'/>
-	<button class="action setting-clear inactive" type="button" name="setting-clear" value="Clear" data-tooltip="Clear">
-		<i class="ss-icon ss-symbolicons-block undo">&#x21A9;</i><span class="sr">Clear Value</span>
+	<button class="action setting-clear inactive" type="button" name="setting-clear" value="${_("Clear")}" data-tooltip="${_("Clear")}">
+		<i class="ss-icon ss-symbolicons-block undo">&#x21A9;</i><span class="sr">${_("Clear Value")}</span>
 	</button>
 </div>
 <span class="tip setting-help"><%= model.get('help') %></span>
diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss
index 2ee1d74cd9..cb914e74f8 100644
--- a/cms/static/sass/views/_unit.scss
+++ b/cms/static/sass/views/_unit.scss
@@ -973,6 +973,7 @@ body.unit {
   }
 }
 
+//hides latex compiler button if settings mode is-active
 div.wrapper-comp-editor.is-inactive + div.launch-latex-compiler{
  display: none;
 }
\ No newline at end of file
diff --git a/cms/templates/component.html b/cms/templates/component.html
index 54c62dcba9..9e7508ae08 100644
--- a/cms/templates/component.html
+++ b/cms/templates/component.html
@@ -1,13 +1,14 @@
+<%! from django.utils.translation import ugettext as _ %>
 <div class="wrapper wrapper-component-editor">
 	<div class="component-editor">
 		<div class="component-edit-header">
   			<span class="component-name"></span>
   	  		<ul class="nav-edit-modes">
   	  			<li id="editor-mode" class="mode active-mode" aria-controls="editor-tab" role="tab">
-  	  				<a href="#">Editor</a>
+  	  				<a href="#">${_("Editor")}</a>
 	  			</li>
 	  			<li id="settings-mode" class="mode active-mode" aria-controls="settings-tab" role="tab">
-	  				<a href="#">Settings</a>
+	  				<a href="#">${_("Settings")}</a>
 	  			</li>
 	  		</ul>
 		</div> <!-- Editor Header -->
@@ -18,15 +19,15 @@
 	        </div>
 		</div>
 		<div class="row module-actions">
-	  		<a href="#" class="save-button">Save</a>
-	  		<a href="#" class="cancel-button">Cancel</a>	  	
+	  		<a href="#" class="save-button">${_("Save")}</a>
+	  		<a href="#" class="cancel-button">${_("Cancel")}</a>	  	
 		</div> <!-- Module Actions-->
   </div>
 </div>
 
 <div class="component-actions">
-  <a href="#" class="edit-button standard"><span class="edit-icon"></span>Edit</a>
-  <a href="#" class="delete-button standard"><span class="delete-icon"></span>Delete</a>  
+  <a href="#" class="edit-button standard"><span class="edit-icon"></span>${_("Edit")}</a>
+  <a href="#" class="delete-button standard"><span class="delete-icon"></span>${_("Delete")}</a>  
 </div>
 <a data-tooltip="Drag to reorder" href="#" class="drag-handle"></a>
 ${preview}
diff --git a/cms/templates/unit.html b/cms/templates/unit.html
index cb34f42a09..02a204b9ba 100644
--- a/cms/templates/unit.html
+++ b/cms/templates/unit.html
@@ -1,5 +1,6 @@
 <%inherit file="base.html" />
 <%! from django.core.urlresolvers import reverse %>
+<%! from django.utils.translation import ugettext as _ %>
 <%namespace name="units" file="widgets/units.html" />
 <%block name="title">Individual Unit</%block>
 <%block name="bodyclass">is-signedin course unit</%block>
@@ -35,23 +36,23 @@
   <div class="main-wrapper edit-state-${unit_state}" data-id="${unit_location}">
     <div class="inner-wrapper">
       <div class="alert editing-draft-alert">
-        <p class="alert-message"><strong>You are editing a draft.</strong>
+        <p class="alert-message"><strong>${_("You are editing a draft.")}</strong>
         % if published_date:
         This unit was originally published on ${published_date}.
         % endif
         </p>
-        <a href="${published_preview_link}" target="_blank" class="alert-action secondary">View the Live Version</a>
+        <a href="${published_preview_link}" target="_blank" class="alert-action secondary">${_("View the Live Version")}</a>
       </div>
       <div class="main-column">
         <article class="unit-body window">
-          <p class="unit-name-input"><label>Display Name:</label><input type="text" value="${unit.display_name_with_default | h}" class="unit-display-name-input" /></p>
+          <p class="unit-name-input"><label>${_("Display Name:")}</label><input type="text" value="${unit.display_name_with_default | h}" class="unit-display-name-input" /></p>
           <ol class="components">
             % for id in components:
             <li class="component" data-id="${id}"/>
             % endfor
             <li class="new-component-item adding">
               <div class="new-component">
-                <h5>Add New Component</h5>
+                <h5>${_("Add New Component")}</h5>
                 <ul class="new-component-type">
                   % for type in sorted(component_templates.keys()):
                   <li>
@@ -69,10 +70,10 @@
                     <div class="tab-group tabs">
                             <ul class="problem-type-tabs nav-tabs">
                               <li class="current">
-                                <a class="link-tab" href="#tab1">Common Problem Types</a>
+                                <a class="link-tab" href="#tab1">${_("Common Problem Types")}</a>
                               </li>
                               <li>
-                                <a class="link-tab" href="#tab2">Advanced</a>
+                                <a class="link-tab" href="#tab2">${_("Advanced")}</a>
                               </li>
                             </ul>
                     % endif
@@ -125,7 +126,7 @@
                             </div>
                     </div>
                     % endif
-                    <a href="#" class="cancel-button">Cancel</a>
+                    <a href="#" class="cancel-button">${_("Cancel")}</a>
                 </div>
                 % endfor
             </li>
@@ -135,13 +136,13 @@
 
       <div class="sidebar">
         <div class="unit-settings window">
-          <h4 class="header">Unit Settings</h4>
+          <h4 class="header">${_("Unit Settings")}</h4>
           <div class="window-contents">
             <div class="row visibility">
-              <label class="inline-label">Visibility:</label>
+              <label class="inline-label">${_("Visibility:")}</label>
               <select class='visibility-select'>
-                <option value="public">Public</option>
-                <option value="private">Private</option>
+                <option value="public">${_("Public")}</option>
+                <option value="private">${_("Private")}</option>
               </select>
             </div>
             <div class="row published-alert">
@@ -156,14 +157,14 @@
               with the subsection <a href="${reverse('edit_subsection', kwargs={'location': subsection.location})}">"${subsection.display_name_with_default}"</a></p>
             </div>
             <div class="row unit-actions">
-              <a href="#" class="delete-draft delete-button">Delete Draft</a>
-              <a href="${draft_preview_link}" target="_blank" class="preview-button">Preview</a>
-              <a href="${published_preview_link}" target="_blank" class="view-button">View Live</a>
+              <a href="#" class="delete-draft delete-button">${_("Delete Draft")}</a>
+              <a href="${draft_preview_link}" target="_blank" class="preview-button">${_("Preview")}</a>
+              <a href="${published_preview_link}" target="_blank" class="view-button">${_("View Live")}</a>
             </div>
           </div>
         </div>
         <div class="window unit-location">
-          <h4 class="header">Unit Location</h4>
+          <h4 class="header">${_("Unit Location")}</h4>
           <div class="window-contents">
             <div><input type="text" class="url" value="/courseware/${section.url_name}/${subsection.url_name}" disabled /></div>
             <ol>