diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py
index 14f96e312a..f70164138d 100644
--- a/cms/djangoapps/contentstore/views.py
+++ b/cms/djangoapps/contentstore/views.py
@@ -261,7 +261,6 @@ def edit_unit(request, location):
             break
 
     lms_link = get_lms_link_for_item(item.location)
-    preview_lms_link = get_lms_link_for_item(item.location, preview=True)
 
     component_templates = defaultdict(list)
 
diff --git a/cms/static/js/base.js b/cms/static/js/base.js
index 41c1ee3cdb..7e55d2b8d8 100644
--- a/cms/static/js/base.js
+++ b/cms/static/js/base.js
@@ -80,64 +80,6 @@ $(document).ready(function() {
         $('.import .file-input').click();
     });
 
-    // making the unit list draggable. Note: sortable didn't work b/c it considered
-    // drop points which the user hovered over as destinations and proactively changed
-    // the dom; so, if the user subsequently dropped at an illegal spot, the reversion
-    // point was the last dom change.
-    $('.unit').draggable({
-    	axis: 'y',
-    	handle: '.drag-handle',
-    	zIndex: 999,  
-    	start: initiateHesitate,
-    	drag: checkHoverState,
-    	stop: removeHesitate,
-    	revert: "invalid"
-    });
-    
-    // Subsection reordering
-    $('.id-holder').draggable({
-    	axis: 'y',
-    	handle: '.section-item .drag-handle',
-    	zIndex: 999,  
-    	start: initiateHesitate,
-    	drag: checkHoverState,
-    	stop: removeHesitate,
-    	revert: "invalid"
-    });
-    
-    // Section reordering
-    $('.courseware-section').draggable({
-    	axis: 'y',
-    	handle: 'header .drag-handle',
-    	stack: '.courseware-section',
-    	revert: "invalid"
-    });
-    
-    
-    $('.sortable-unit-list').droppable({
-    	accept : '.unit',
-    	greedy: true,
-    	tolerance: "pointer",
-    	hoverClass: "dropover",
-    	drop: onUnitReordered
-    });
-    $('.subsection-list > ol').droppable({
-    	// why don't we have a more useful class for subsections than id-holder?
-    	accept : '.id-holder', // '.unit, .id-holder',
-    	tolerance: "pointer",
-    	hoverClass: "dropover",
-    	drop: onSubsectionReordered,
-    	greedy: true
-    });
-    
-    // Section reordering
-    $('.courseware-overview').droppable({
-    	accept : '.courseware-section',
-    	tolerance: "pointer",
-    	drop: onSectionReordered,
-    	greedy: true
-    });
-
     $('.new-course-button').bind('click', addNewCourse);
 
     // section name editing
@@ -279,136 +221,6 @@ function removePolicyMetadata(e) {
     saveSubsection()
 }
 
-CMS.HesitateEvent.toggleXpandHesitation = null;
-function initiateHesitate(event, ui) {
-	CMS.HesitateEvent.toggleXpandHesitation = new CMS.HesitateEvent(expandSection, 'dragLeave', true);
-	$('.collapsed').on('dragEnter', CMS.HesitateEvent.toggleXpandHesitation, CMS.HesitateEvent.toggleXpandHesitation.trigger);
-	$('.collapsed').each(function() {
-		this.proportions = {width : this.offsetWidth, height : this.offsetHeight };
-		// reset b/c these were holding values from aborts
-		this.isover = false;
-	});
-}
-function checkHoverState(event, ui) {
-	// copied from jquery.ui.droppable.js $.ui.ddmanager.drag & other ui.intersect
-	var draggable = $(this).data("ui-draggable"),
-		x1 = (draggable.positionAbs || draggable.position.absolute).left + (draggable.helperProportions.width / 2), 
-		y1 = (draggable.positionAbs || draggable.position.absolute).top + (draggable.helperProportions.height / 2);
-	$('.collapsed').each(function() {
-		// don't expand the thing being carried
-		if (ui.helper.is(this)) {
-			return;
-		}
-		
-		$.extend(this, {offset : $(this).offset()});
-
-		var droppable = this,
-			l = droppable.offset.left, 
-			r = l + droppable.proportions.width,
-			t = droppable.offset.top, 
-			b = t + droppable.proportions.height;
-		
-		if (l === r) {
-			// probably wrong values b/c invisible at the time of caching
-			droppable.proportions = { width : droppable.offsetWidth, height : droppable.offsetHeight };
-			r = l + droppable.proportions.width;
-			b = t + droppable.proportions.height;
-		}
-		// equivalent to the intersects test
-		var intersects = (l < x1  && // Right Half
-					x1  < r && // Left Half
-					t < y1 && // Bottom Half
-					y1  < b ), // Top Half
-
-			c = !intersects && this.isover ? "isout" : (intersects && !this.isover ? "isover" : null);
-			
-		if(!c) {
-			return;
-		}
-
-		this[c] = true;
-		this[c === "isout" ? "isover" : "isout"] = false;
-		$(this).trigger(c === "isover" ? "dragEnter" : "dragLeave");
-	});
-}
-function removeHesitate(event, ui) {
-	$('.collapsed').off('dragEnter', CMS.HesitateEvent.toggleXpandHesitation.trigger);
-	CMS.HesitateEvent.toggleXpandHesitation = null;
-}
-
-function expandSection(event) {
-	$(event.delegateTarget).removeClass('collapsed', 400); 
-	// don't descend to icon's on children (which aren't under first child) only to this element's icon
-	$(event.delegateTarget).children().first().find('.expand-collapse-icon').removeClass('expand', 400).addClass('collapse');
-}
-
-function onUnitReordered(event, ui) {
-	// a unit's been dropped on this subsection,
-	//       figure out where it came from and where it slots in. 
-	_handleReorder(event, ui, 'subsection-id', 'li:.leaf');
-}
-
-function onSubsectionReordered(event, ui) {
-	// a subsection has been dropped on this section,
-	//       figure out where it came from and where it slots in. 
-	_handleReorder(event, ui, 'section-id', 'li:.branch');
-}
-
-function onSectionReordered(event, ui) {
-	// a section moved w/in the overall (cannot change course via this, so no parentage change possible, just order)
-	_handleReorder(event, ui, 'course-id', '.courseware-section');
-}
-
-function _handleReorder(event, ui, parentIdField, childrenSelector) {
-	// figure out where it came from and where it slots in. 
-	var subsection_id = $(event.target).data(parentIdField);
-	var _els = $(event.target).children(childrenSelector);
-	var children = _els.map(function(idx, el) { return $(el).data('id'); }).get();
-	// if new to this parent, figure out which parent to remove it from and do so
-	if (!_.contains(children, ui.draggable.data('id'))) {
-		var old_parent = ui.draggable.parent();
-		var old_children = old_parent.children(childrenSelector).map(function(idx, el) { return $(el).data('id'); }).get();
-		old_children = _.without(old_children, ui.draggable.data('id'));
-		$.ajax({
-			url: "/save_item",
-			type: "POST",
-			dataType: "json",
-			contentType: "application/json",
-			data:JSON.stringify({ 'id' : old_parent.data(parentIdField), 'children' : old_children})
-		});
-	}
-	else {
-		// staying in same parent
-		// remove so that the replacement in the right place doesn't double it
-		children = _.without(children, ui.draggable.data('id'));
-	}
-	// add to this parent (figure out where)
-	for (var i = 0; i < _els.length; i++) {
-		if (!ui.draggable.is(_els[i]) && ui.offset.top < $(_els[i]).offset().top) {
-			// insert at i in children and _els
-			ui.draggable.insertBefore($(_els[i]));
-			// TODO figure out correct way to have it remove the style: top:n; setting (and similar line below)
-			ui.draggable.attr("style", "position:relative;");
-			children.splice(i, 0, ui.draggable.data('id'));
-			break;
-		}
-	}
-	// see if it goes at end (the above loop didn't insert it)
-	if (!_.contains(children, ui.draggable.data('id'))) {
-		$(event.target).append(ui.draggable);
-		ui.draggable.attr("style", "position:relative;"); // STYLE hack too
-		children.push(ui.draggable.data('id'));
-	}
-	$.ajax({
-		url: "/save_item",
-		type: "POST",
-		dataType: "json",
-		contentType: "application/json",
-		data:JSON.stringify({ 'id' : subsection_id, 'children' : children})
-	});
-
-}
-
 function getEdxTimeFromDateTimeVals(date_val, time_val, format) {
     var edxTimeStr = null;
 
diff --git a/cms/static/js/views/overview.js b/cms/static/js/views/overview.js
new file mode 100644
index 0000000000..c007ef3efc
--- /dev/null
+++ b/cms/static/js/views/overview.js
@@ -0,0 +1,191 @@
+$(document).ready(function() {
+    // making the unit list draggable. Note: sortable didn't work b/c it considered
+    // drop points which the user hovered over as destinations and proactively changed
+    // the dom; so, if the user subsequently dropped at an illegal spot, the reversion
+    // point was the last dom change.
+    $('.unit').draggable({
+        axis: 'y',
+        handle: '.drag-handle',
+        zIndex: 999,  
+        start: initiateHesitate,
+        drag: checkHoverState,
+        stop: removeHesitate,
+        revert: "invalid"
+    });
+    
+    // Subsection reordering
+    $('.id-holder').draggable({
+        axis: 'y',
+        handle: '.section-item .drag-handle',
+        zIndex: 999,  
+        start: initiateHesitate,
+        drag: checkHoverState,
+        stop: removeHesitate,
+        revert: "invalid"
+    });
+    
+    // Section reordering
+    $('.courseware-section').draggable({
+        axis: 'y',
+        handle: 'header .drag-handle',
+        stack: '.courseware-section',
+        revert: "invalid"
+    });
+    
+    
+    $('.sortable-unit-list').droppable({
+        accept : '.unit',
+        greedy: true,
+        tolerance: "pointer",
+        hoverClass: "dropover",
+        drop: onUnitReordered
+    });
+    $('.subsection-list > ol').droppable({
+        // why don't we have a more useful class for subsections than id-holder?
+        accept : '.id-holder', // '.unit, .id-holder',
+        tolerance: "pointer",
+        hoverClass: "dropover",
+        drop: onSubsectionReordered,
+        greedy: true
+    });
+    
+    // Section reordering
+    $('.courseware-overview').droppable({
+        accept : '.courseware-section',
+        tolerance: "pointer",
+        drop: onSectionReordered,
+        greedy: true
+    });
+    
+});
+
+
+CMS.HesitateEvent.toggleXpandHesitation = null;
+function initiateHesitate(event, ui) {
+        CMS.HesitateEvent.toggleXpandHesitation = new CMS.HesitateEvent(expandSection, 'dragLeave', true);
+        $('.collapsed').on('dragEnter', CMS.HesitateEvent.toggleXpandHesitation, CMS.HesitateEvent.toggleXpandHesitation.trigger);
+        $('.collapsed').each(function() {
+                this.proportions = {width : this.offsetWidth, height : this.offsetHeight };
+                // reset b/c these were holding values from aborts
+                this.isover = false;
+        });
+}
+function checkHoverState(event, ui) {
+        // copied from jquery.ui.droppable.js $.ui.ddmanager.drag & other ui.intersect
+        var draggable = $(this).data("ui-draggable"),
+                x1 = (draggable.positionAbs || draggable.position.absolute).left + (draggable.helperProportions.width / 2), 
+                y1 = (draggable.positionAbs || draggable.position.absolute).top + (draggable.helperProportions.height / 2);
+        $('.collapsed').each(function() {
+                // don't expand the thing being carried
+                if (ui.helper.is(this)) {
+                        return;
+                }
+                
+                $.extend(this, {offset : $(this).offset()});
+
+                var droppable = this,
+                        l = droppable.offset.left, 
+                        r = l + droppable.proportions.width,
+                        t = droppable.offset.top, 
+                        b = t + droppable.proportions.height;
+                
+                if (l === r) {
+                        // probably wrong values b/c invisible at the time of caching
+                        droppable.proportions = { width : droppable.offsetWidth, height : droppable.offsetHeight };
+                        r = l + droppable.proportions.width;
+                        b = t + droppable.proportions.height;
+                }
+                // equivalent to the intersects test
+                var intersects = (l < x1  && // Right Half
+                                        x1  < r && // Left Half
+                                        t < y1 && // Bottom Half
+                                        y1  < b ), // Top Half
+
+                        c = !intersects && this.isover ? "isout" : (intersects && !this.isover ? "isover" : null);
+                        
+                if(!c) {
+                        return;
+                }
+
+                this[c] = true;
+                this[c === "isout" ? "isover" : "isout"] = false;
+                $(this).trigger(c === "isover" ? "dragEnter" : "dragLeave");
+        });
+}
+function removeHesitate(event, ui) {
+        $('.collapsed').off('dragEnter', CMS.HesitateEvent.toggleXpandHesitation.trigger);
+        CMS.HesitateEvent.toggleXpandHesitation = null;
+}
+
+function expandSection(event) {
+        $(event.delegateTarget).removeClass('collapsed', 400); 
+        // don't descend to icon's on children (which aren't under first child) only to this element's icon
+        $(event.delegateTarget).children().first().find('.expand-collapse-icon').removeClass('expand', 400).addClass('collapse');
+}
+
+function onUnitReordered(event, ui) {
+        // a unit's been dropped on this subsection,
+        //       figure out where it came from and where it slots in. 
+        _handleReorder(event, ui, 'subsection-id', 'li:.leaf');
+}
+
+function onSubsectionReordered(event, ui) {
+        // a subsection has been dropped on this section,
+        //       figure out where it came from and where it slots in. 
+        _handleReorder(event, ui, 'section-id', 'li:.branch');
+}
+
+function onSectionReordered(event, ui) {
+        // a section moved w/in the overall (cannot change course via this, so no parentage change possible, just order)
+        _handleReorder(event, ui, 'course-id', '.courseware-section');
+}
+
+function _handleReorder(event, ui, parentIdField, childrenSelector) {
+        // figure out where it came from and where it slots in. 
+        var subsection_id = $(event.target).data(parentIdField);
+        var _els = $(event.target).children(childrenSelector);
+        var children = _els.map(function(idx, el) { return $(el).data('id'); }).get();
+        // if new to this parent, figure out which parent to remove it from and do so
+        if (!_.contains(children, ui.draggable.data('id'))) {
+                var old_parent = ui.draggable.parent();
+                var old_children = old_parent.children(childrenSelector).map(function(idx, el) { return $(el).data('id'); }).get();
+                old_children = _.without(old_children, ui.draggable.data('id'));
+                $.ajax({
+                        url: "/save_item",
+                        type: "POST",
+                        dataType: "json",
+                        contentType: "application/json",
+                        data:JSON.stringify({ 'id' : old_parent.data(parentIdField), 'children' : old_children})
+                });
+        }
+        else {
+                // staying in same parent
+                // remove so that the replacement in the right place doesn't double it
+                children = _.without(children, ui.draggable.data('id'));
+        }
+        // add to this parent (figure out where)
+        for (var i = 0; i < _els.length; i++) {
+                if (!ui.draggable.is(_els[i]) && ui.offset.top < $(_els[i]).offset().top) {
+                        // insert at i in children and _els
+                        ui.draggable.insertBefore($(_els[i]));
+                        // TODO figure out correct way to have it remove the style: top:n; setting (and similar line below)
+                        ui.draggable.attr("style", "position:relative;");
+                        children.splice(i, 0, ui.draggable.data('id'));
+                        break;
+                }
+        }
+        // see if it goes at end (the above loop didn't insert it)
+        if (!_.contains(children, ui.draggable.data('id'))) {
+                $(event.target).append(ui.draggable);
+                ui.draggable.attr("style", "position:relative;"); // STYLE hack too
+                children.push(ui.draggable.data('id'));
+        }
+        $.ajax({
+                url: "/save_item",
+                type: "POST",
+                dataType: "json",
+                contentType: "application/json",
+                data:JSON.stringify({ 'id' : subsection_id, 'children' : children})
+        });
+
+}
diff --git a/cms/templates/overview.html b/cms/templates/overview.html
index a20531200e..20ddcead01 100644
--- a/cms/templates/overview.html
+++ b/cms/templates/overview.html
@@ -18,6 +18,7 @@
   <script src="${static.url('js/vendor/date.js')}"></script>
   <script type="text/javascript" src="${static.url('js/models/course_relative.js')}"></script>
   <script type="text/javascript" src="${static.url('js/views/grader-select-view.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/views/overview.js')}"></script>
   <script type="text/javascript" src="${static.url('js/models/settings/course_grading_policy.js')}"></script>
 
   <script type="text/javascript">