diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss
index c7cdce3cb1..57ce1e67d0 100644
--- a/cms/static/sass/views/_unit.scss
+++ b/cms/static/sass/views/_unit.scss
@@ -662,10 +662,10 @@ body.course.unit {
       select {
         //border: 1px solid $gray-l2;
         background: none repeat scroll #F2F2F2;
-        padding: 5px;
+        @include box-shadow(0 1px 2px rgba(0, 0, 0, .1) inset);
 
         &:focus {
-          @include box-shadow(0 1px 1px $shadow);
+          @include box-shadow(0 0 1px $shadow);
           @include transition(opacity 0.25s ease-in-out);
           background-color: #FFFCF1;
         }
diff --git a/cms/templates/component.html b/cms/templates/component.html
index 250609d43e..9dd46f1c53 100644
--- a/cms/templates/component.html
+++ b/cms/templates/component.html
@@ -59,88 +59,116 @@
 
 			  		<li class="field comp-setting-entry">
 			  			<div class="wrapper-comp-setting">
-				  			<label class="label setting-label" for="setting-displayName">Discussion Area</label>
-				  			<input class="input setting-input" type="text" id="setting-accept_file_upload" value="False"/> 
+				  			<label class="label setting-label" for="setting-discussion_category">Discussion Area</label>
+				  			<input class="input setting-input" type="text" id="setting-discussion_category" value="Defined by Course Template"/> 
 				  			<!--button clickable if is-set -->
 				  			<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>
 				  			</button>
 				  		</div>
-			  			<span class="tip setting-help">This value specifies the discussion are where this . This name appears in the left pane of the discussion forum for your course (question)</span>
-			  		</li>
-
-
-
-
-
-					<li class="field comp-setting-entry">
-			  			<div class="wrapper-comp-setting">
-				  			<label class="label setting-label" for="setting-displayName">Accept Fle Upload</label>
-				  			<input class="input setting-input" type="text" id="setting-accept_file_upload" value="False"/> 
-				  			<!--button clickable if is-set -->
-				  			<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>
-				  			</button>
-				  		</div>
-			  			<span class="tip setting-help">This value defines the name of this component, and is shown to students as a tooltip.</span>
-			  		</li>
-
-
-
-
-
-			  		<li class="field comp-setting-entry is-set">
-			  			<div class="wrapper-comp-setting">
-				  			<label class="label setting-label" for="setting-displayName">Display Name</label>
-				  			<input class="input setting-input" type="text" id="setting-displayName" value="closed"/> 
-				  			<!--button clickable if is-set -->
-				  			<button class="action setting-clear" type="button" name="setting-clear" value="Clear" data-tooltip="Clear">
-				  				<i class="ss-icon ss-symbolicons-block undo">&#x21A9;</i>
-				  			</button>
-				  		</div>
-			  			<span class="tip setting-help">This value defines the name of this component, and is shown to students as a tooltip.</span>
+			  			<span class="tip setting-help">This value specifies the discussion are where this component lives, organized in the left pane of the discussion forum for your course. </span>
 			  		</li>
 
 			  		<li class="field comp-setting-entry">
 			  			<div class="wrapper-comp-setting">
-				  			<label class="label setting-label" for="setting-displayName">Maximum Attempts</label>
-				  			<input class="input setting-input" type="number" placeholder="None Set" id="setting-displayName"/> 
+				  			<label class="label setting-label" for="setting-display_name">Display Name</label>
+				  			<input class="input setting-input" type="text" id="setting-display_name" placeholder="Unnamed Component"/> 
+				  			<!--button clickable if is-set -->
 				  			<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>
 				  			</button>
-			  			</div>
-			  			<span class="tip setting-help">When set, this limits the number of times a student can attempt this problem.</span>
+				  		</div>
+			  			<span class="tip setting-help">This value defines the name of this component, and is shown to students as a tooltip. </span>
 			  		</li>
 
 			  		<li class="field comp-setting-entry">
 			  			<div class="wrapper-comp-setting">
-				  			<label class="label setting-label" for="setting-displayName">Randomization</label>
-				  			<select class="input setting-input" id="setting-displayName" name="type">
+				  			<label class="label setting-label" for="setting-is_graded">Graded</label>
+				  			<select class="input setting-input" id="setting-is_graded" name="Graded">
 				  				<!--% for all in available options -->
-								<option value="displayName-closed" selected>Closed</option>
-								<!--in case value already defaulted --> 
-								<option value="displayName-notclosed">NotClosed</option>
-								<option value="displayName-open">Open</option>
-								<option value="displayName-available">Available</option>
+								<option value="True">True</option>
+								<option value="False" selected>False</option>
 							</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>
 				  			</button>
 			  			</div>
-			  			<span class="tip setting-help">helpstring</span>
+			  			<span class="tip setting-help">If disabled, this problem will not be graded.</span>
 			  		</li>
 
-			  		<li class="field comp-setting-entry is-set">
+					<li class="field comp-setting-entry">
 			  			<div class="wrapper-comp-setting">
-				  			<label class="label setting-label" for="setting-id-4">Show Answer</label>
-				  			<input class="input setting-input" type="text" id="setting-id-4" value="Name of Component"/> 
+				  			<label class="label setting-label" for="setting-weight">Problem Weight</label>
+				  			<input class="input setting-input" type="number" id="setting-weight" placeholder="Not set"/> 
 				  			<!--button clickable if is-set -->
-				  			<button class="action setting-clear" type="button" name="setting-clear" value="Clear" data-tooltip="Clear">
+				  			<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>
 				  			</button>
 				  		</div>
-			  			<span class="tip setting-help">helpstring</span>
+			  			<span class="tip setting-help">This value ....needs helpstring....</span>
 			  		</li>
+
+			  		<li class="field comp-setting-entry">
+			  			<div class="wrapper-comp-setting">
+				  			<label class="label setting-label" for="setting-rerandomize">Randomization</label>
+				  			<select class="input setting-input" id="setting-rerandomize" name="Randomization">
+				  				<!--% for all in available options -->
+								<option value="always" selected>Always</option>
+								<!--in case value already defaulted --> 
+								<option value="onreset">On Reset</option>
+								<option value="never">Never</option>
+								<option value="per_student">Per Student</option>
+							</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>
+				  			</button>
+			  			</div>
+			  			<span class="tip setting-help">Choose from a few different ways to incorporate randomization into this problem.</span>
+			  		</li>
+
+			  		<li class="field comp-setting-entry">
+			  			<div class="wrapper-comp-setting">
+				  			<label class="label setting-label" for="setting-showanswer">Show Answer</label>
+				  			<select class="input setting-input" id="setting-showanswer" name="Show Answer">
+				  				<!--% for all in available options -->
+								<option value="never">Never</option>
+								<option value="closed" selected>Closed</option>
+								<option value="attempted">Attempted</option>
+								<option value="answered" Answered>Closed</option>
+								<option value="always">Always</option>
+							</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>
+				  			</button>
+			  			</div>
+			  			<span class="tip setting-help">Choose from a few different options to define whether students interact with the problem's answer. (info icon here) You can define this for every problem in a course.</span>
+			  		</li>
+
+			  		<li class="field comp-setting-entry">
+			  			<div class="wrapper-comp-setting">
+				  			<label class="label setting-label" for="setting-sort_key">Sort Order Key</label>
+				  			<input class="input setting-input" type="text" id="setting-sort_key" placeholder="Not set"/> 
+				  			<!--button clickable if is-set -->
+				  			<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>
+				  			</button>
+				  		</div>
+			  			<span class="tip setting-help">You can specify the order of discussion areas in the discussion dropdown menu. Their order is alphabetical, but uses the sort key value instead of their name.</span>
+			  		</li>
+
+			  		<li class="field comp-setting-entry">
+			  			<div class="wrapper-comp-setting">
+				  			<label class="label setting-label" for="setting-discussion_target">Subcategory (RENAME?)</label>
+				  			<input class="input setting-input" type="text" id="setting-discussion_target" value="Week 1 - Defined by Course Template"/> 
+				  			<!--button clickable if is-set -->
+				  			<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>
+				  			</button>
+				  		</div>
+			  			<span class="tip setting-help">Specify a subcategory name for this discussion. This name appears in the left pane of the discussion forum for your course.</span>
+			  		</li>
+
+
 			  		
 			  	</ul>
 			  </div> <!-- Settings Wrapper-->