diff --git a/cms/djangoapps/contentstore/views/library.py b/cms/djangoapps/contentstore/views/library.py
index 7ea3ebf21932..392e871d4f51 100644
--- a/cms/djangoapps/contentstore/views/library.py
+++ b/cms/djangoapps/contentstore/views/library.py
@@ -159,4 +159,5 @@ def library_blocks_view(library, response_format):
         'unit': None,
         'component_templates': json.dumps(component_templates),
         'xblock_info': xblock_info,
+        'show_children_previews': library.show_children_previews
     })
diff --git a/cms/djangoapps/contentstore/views/preview.py b/cms/djangoapps/contentstore/views/preview.py
index 3e292827b178..39ac169b6b46 100644
--- a/cms/djangoapps/contentstore/views/preview.py
+++ b/cms/djangoapps/contentstore/views/preview.py
@@ -95,6 +95,12 @@ def handler_url(self, block, handler_name, suffix='', query='', thirdparty=False
     def local_resource_url(self, block, uri):
         return local_resource_url(block, uri)
 
+    def render(self, block, view_name, context=None):
+        if not context.get('show_preview', True):
+            return self.wrap_child(block, view_name, Fragment(), context)
+        else:
+            return super(PreviewModuleSystem, self).render(block, view_name, context)
+
 
 class StudioUserService(object):
     """
diff --git a/cms/static/coffee/spec/main.coffee b/cms/static/coffee/spec/main.coffee
index 0cd0cd2b6f52..0525788a7ba0 100644
--- a/cms/static/coffee/spec/main.coffee
+++ b/cms/static/coffee/spec/main.coffee
@@ -223,7 +223,7 @@ define([
     "js/spec/views/assets_spec",
     "js/spec/views/baseview_spec",
     "js/spec/views/container_spec",
-    "js/spec/views/paging_container_spec",
+    "js/spec/views/library_container_spec",
     "js/spec/views/group_configuration_spec",
     "js/spec/views/paging_spec",
     "js/spec/views/unit_outline_spec",
diff --git a/cms/static/js/spec/views/paging_container_spec.js b/cms/static/js/spec/views/library_container_spec.js
similarity index 50%
rename from cms/static/js/spec/views/paging_container_spec.js
rename to cms/static/js/spec/views/library_container_spec.js
index 098a02aed8b5..80f9d732bfdd 100644
--- a/cms/static/js/spec/views/paging_container_spec.js
+++ b/cms/static/js/spec/views/library_container_spec.js
@@ -1,119 +1,169 @@
 define([ "jquery", "underscore", "js/common_helpers/ajax_helpers", "URI", "js/models/xblock_info",
-    "js/views/paged_container", "js/views/paging_header", "js/views/paging_footer"],
-    function ($, _, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingContainer, PagingFooter) {
+    "js/views/library_container", "js/views/paging_header", "js/views/paging_footer"],
+    function ($, _, AjaxHelpers, URI, XBlockInfo, LibraryContainer, PagingHeader, PagingFooter) {
 
         var htmlResponseTpl = _.template('' +
-            '<div class="xblock-container-paging-parameters" data-start="<%= start %>" data-displayed="<%= displayed %>" data-total="<%= total %>"/>'
+            '<div class="xblock-container-paging-parameters" ' +
+                'data-start="<%= start %>" ' +
+                'data-displayed="<%= displayed %>" ' +
+                'data-total="<%= total %>" ' +
+                'data-previews="<%= previews %>"></div>'
         );
 
-        function getResponseHtml(options){
+        var getResponseHtml = function (options){
+            var default_values = {
+                start: 0,
+                displayed: PAGE_SIZE,
+                total: PAGE_SIZE + 1,
+                previews: true
+            };
+            var eff_options = _.extend(default_values, options);
             return '<div class="xblock" data-request-token="request_token">' +
                 '<div class="container-paging-header"></div>' +
-                htmlResponseTpl(options) +
+                htmlResponseTpl(eff_options) +
                 '<div class="container-paging-footer"></div>' +
                 '</div>'
-        }
+        };
+
+        var makePage = function(html_parameters) {
+            return {
+                resources: [],
+                html: getResponseHtml(html_parameters)
+            };
+        };
 
         var PAGE_SIZE = 3;
 
-        var mockFirstPage = {
-            resources: [],
-            html: getResponseHtml({
+        var mockFirstPage = makePage({
                 start: 0,
                 displayed: PAGE_SIZE,
                 total: PAGE_SIZE + 1
-            })
-        };
+            });
 
-        var mockSecondPage = {
-            resources: [],
-            html: getResponseHtml({
+        var mockSecondPage = makePage({
                 start: PAGE_SIZE,
                 displayed: 1,
                 total: PAGE_SIZE + 1
-            })
-        };
+            });
 
-        var mockEmptyPage = {
-            resources: [],
-            html: getResponseHtml({
+        var mockEmptyPage = makePage({
                 start: 0,
                 displayed: 0,
                 total: 0
-            })
-        };
+            });
 
-        var respondWithMockPage = function(requests) {
+        var respondWithMockPage = function(requests, response_override) {
             var requestIndex = requests.length - 1;
             var request = requests[requestIndex];
             var url = new URI(request.url);
             var queryParameters = url.query(true); // Returns an object with each query parameter stored as a value
             var page = queryParameters.page_number;
             var response = page === "0" ? mockFirstPage : mockSecondPage;
+            if (typeof response_override !== 'undefined') {
+                response = response_override;
+            }
             AjaxHelpers.respondWithJson(requests, response, requestIndex);
         };
 
-        var MockPagingView = PagedContainer.extend({
+        var MockPagingView = LibraryContainer.extend({
             view: 'container_preview',
             el: $("<div><div class='xblock' data-request-token='test_request_token'/></div>"),
-            model: new XBlockInfo({}, {parse: true})
+            model: new XBlockInfo({}, {parse: true}),
+            page_size: PAGE_SIZE,
+            page_reload_callback: function() {}
         });
 
-        describe("Paging Container", function() {
-            var pagingContainer;
+        describe("Library Container", function() {
+            var LibraryContainer;
 
             beforeEach(function () {
                 var feedbackTpl = readFixtures('system-feedback.underscore');
                 setFixtures($("<script>", { id: "system-feedback-tpl", type: "text/template" }).text(feedbackTpl));
-                pagingContainer = new MockPagingView({ page_size: PAGE_SIZE });
+                LibraryContainer = new MockPagingView({page_size: PAGE_SIZE});
             });
 
             describe("Container", function () {
+                describe("rendering", function(){
+                    beforeEach(function() {
+                        spyOn(LibraryContainer, 'page_reload_callback');
+                        spyOn(LibraryContainer, 'update_previews_callback');
+                    });
+
+                    it('does not call page_reload_callback on inital render', function(){
+                        var requests = AjaxHelpers.requests(this);
+                        LibraryContainer.render();
+                        respondWithMockPage(requests);
+                        expect(LibraryContainer.page_reload_callback).not.toHaveBeenCalled();
+                        expect(LibraryContainer.update_previews_callback).toHaveBeenCalled();
+                    });
+
+                    it('calls page_reload_callback on page change render', function(){
+                        var requests = AjaxHelpers.requests(this);
+                        LibraryContainer.setPage(1);
+                        respondWithMockPage(requests);
+                        expect(LibraryContainer.page_reload_callback).toHaveBeenCalledWith(LibraryContainer.$el);
+                        expect(LibraryContainer.update_previews_callback).toHaveBeenCalledWith(true);
+                    });
+
+                    it('should set show_previews', function() {
+                       var requests = AjaxHelpers.requests(this);
+                       expect(LibraryContainer.collection.show_children_previews).toBe(true); //precondition check
+
+                       LibraryContainer.setPage(0);
+                       respondWithMockPage(requests, makePage({previews: false}));
+                       expect(LibraryContainer.collection.show_children_previews).toBe(false);
+
+                       LibraryContainer.setPage(0);
+                       respondWithMockPage(requests, makePage({previews: true}));
+                       expect(LibraryContainer.collection.show_children_previews).toBe(true);
+                   });
+                });
+
                 describe("setPage", function () {
                     it('can set the current page', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(0);
+                        LibraryContainer.setPage(0);
                         respondWithMockPage(requests);
-                        expect(pagingContainer.collection.currentPage).toBe(0);
-                        pagingContainer.setPage(1);
+                        expect(LibraryContainer.collection.currentPage).toBe(0);
+                        LibraryContainer.setPage(1);
                         respondWithMockPage(requests);
-                        expect(pagingContainer.collection.currentPage).toBe(1);
+                        expect(LibraryContainer.collection.currentPage).toBe(1);
                     });
 
                     it('should not change page after a server error', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(0);
+                        LibraryContainer.setPage(0);
                         respondWithMockPage(requests);
-                        pagingContainer.setPage(1);
+                        LibraryContainer.setPage(1);
                         requests[1].respond(500);
-                        expect(pagingContainer.collection.currentPage).toBe(0);
+                        expect(LibraryContainer.collection.currentPage).toBe(0);
                     });
                 });
 
                 describe("nextPage", function () {
                     it('does not move forward after a server error', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(0);
+                        LibraryContainer.setPage(0);
                         respondWithMockPage(requests);
-                        pagingContainer.nextPage();
+                        LibraryContainer.nextPage();
                         requests[1].respond(500);
-                        expect(pagingContainer.collection.currentPage).toBe(0);
+                        expect(LibraryContainer.collection.currentPage).toBe(0);
                     });
 
                     it('can move to the next page', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(0);
+                        LibraryContainer.setPage(0);
                         respondWithMockPage(requests);
-                        pagingContainer.nextPage();
+                        LibraryContainer.nextPage();
                         respondWithMockPage(requests);
-                        expect(pagingContainer.collection.currentPage).toBe(1);
+                        expect(LibraryContainer.collection.currentPage).toBe(1);
                     });
 
                     it('can not move forward from the final page', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(1);
+                        LibraryContainer.setPage(1);
                         respondWithMockPage(requests);
-                        pagingContainer.nextPage();
+                        LibraryContainer.nextPage();
                         expect(requests.length).toBe(1);
                     });
                 });
@@ -122,28 +172,28 @@ define([ "jquery", "underscore", "js/common_helpers/ajax_helpers", "URI", "js/mo
 
                     it('can move back a page', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(1);
+                        LibraryContainer.setPage(1);
                         respondWithMockPage(requests);
-                        pagingContainer.previousPage();
+                        LibraryContainer.previousPage();
                         respondWithMockPage(requests);
-                        expect(pagingContainer.collection.currentPage).toBe(0);
+                        expect(LibraryContainer.collection.currentPage).toBe(0);
                     });
 
                     it('can not move back from the first page', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(0);
+                        LibraryContainer.setPage(0);
                         respondWithMockPage(requests);
-                        pagingContainer.previousPage();
+                        LibraryContainer.previousPage();
                         expect(requests.length).toBe(1);
                     });
 
                     it('does not move back after a server error', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(1);
+                        LibraryContainer.setPage(1);
                         respondWithMockPage(requests);
-                        pagingContainer.previousPage();
+                        LibraryContainer.previousPage();
                         requests[1].respond(500);
-                        expect(pagingContainer.collection.currentPage).toBe(1);
+                        expect(LibraryContainer.collection.currentPage).toBe(1);
                     });
                 });
             });
@@ -157,91 +207,91 @@ define([ "jquery", "underscore", "js/common_helpers/ajax_helpers", "URI", "js/mo
 
                 describe("Next page button", function () {
                     beforeEach(function () {
-                        pagingContainer.render();
+                        LibraryContainer.render();
                     });
 
                     it('does not move forward if a server error occurs', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(0);
+                        LibraryContainer.setPage(0);
                         respondWithMockPage(requests);
-                        pagingContainer.pagingHeader.$('.next-page-link').click();
+                        LibraryContainer.pagingHeader.$('.next-page-link').click();
                         requests[1].respond(500);
-                        expect(pagingContainer.collection.currentPage).toBe(0);
+                        expect(LibraryContainer.collection.currentPage).toBe(0);
                     });
 
                     it('can move to the next page', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(0);
+                        LibraryContainer.setPage(0);
                         respondWithMockPage(requests);
-                        pagingContainer.pagingHeader.$('.next-page-link').click();
+                        LibraryContainer.pagingHeader.$('.next-page-link').click();
                         respondWithMockPage(requests);
-                        expect(pagingContainer.collection.currentPage).toBe(1);
+                        expect(LibraryContainer.collection.currentPage).toBe(1);
                     });
 
                     it('should be enabled when there is at least one more page', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(0);
+                        LibraryContainer.setPage(0);
                         respondWithMockPage(requests);
-                        expect(pagingContainer.pagingHeader.$('.next-page-link')).not.toHaveClass('is-disabled');
+                        expect(LibraryContainer.pagingHeader.$('.next-page-link')).not.toHaveClass('is-disabled');
                     });
 
                     it('should be disabled on the final page', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(1);
+                        LibraryContainer.setPage(1);
                         respondWithMockPage(requests);
-                        expect(pagingContainer.pagingHeader.$('.next-page-link')).toHaveClass('is-disabled');
+                        expect(LibraryContainer.pagingHeader.$('.next-page-link')).toHaveClass('is-disabled');
                     });
 
                     it('should be disabled on an empty page', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(0);
+                        LibraryContainer.setPage(0);
                         AjaxHelpers.respondWithJson(requests, mockEmptyPage);
-                        expect(pagingContainer.pagingHeader.$('.next-page-link')).toHaveClass('is-disabled');
+                        expect(LibraryContainer.pagingHeader.$('.next-page-link')).toHaveClass('is-disabled');
                     });
                 });
 
                 describe("Previous page button", function () {
                     beforeEach(function () {
-                        pagingContainer.render();
+                        LibraryContainer.render();
                     });
 
                     it('does not move back if a server error occurs', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(1);
+                        LibraryContainer.setPage(1);
                         respondWithMockPage(requests);
-                        pagingContainer.pagingHeader.$('.previous-page-link').click();
+                        LibraryContainer.pagingHeader.$('.previous-page-link').click();
                         requests[1].respond(500);
-                        expect(pagingContainer.collection.currentPage).toBe(1);
+                        expect(LibraryContainer.collection.currentPage).toBe(1);
                     });
 
                     it('can go back a page', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(1);
+                        LibraryContainer.setPage(1);
                         respondWithMockPage(requests);
-                        pagingContainer.pagingHeader.$('.previous-page-link').click();
+                        LibraryContainer.pagingHeader.$('.previous-page-link').click();
                         respondWithMockPage(requests);
-                        expect(pagingContainer.collection.currentPage).toBe(0);
+                        expect(LibraryContainer.collection.currentPage).toBe(0);
                     });
 
                     it('should be disabled on the first page', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(0);
+                        LibraryContainer.setPage(0);
                         respondWithMockPage(requests);
-                        expect(pagingContainer.pagingHeader.$('.previous-page-link')).toHaveClass('is-disabled');
+                        expect(LibraryContainer.pagingHeader.$('.previous-page-link')).toHaveClass('is-disabled');
                     });
 
                     it('should be enabled on the second page', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(1);
+                        LibraryContainer.setPage(1);
                         respondWithMockPage(requests);
-                        expect(pagingContainer.pagingHeader.$('.previous-page-link')).not.toHaveClass('is-disabled');
+                        expect(LibraryContainer.pagingHeader.$('.previous-page-link')).not.toHaveClass('is-disabled');
                     });
 
                     it('should be disabled for an empty page', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(0);
+                        LibraryContainer.setPage(0);
                         AjaxHelpers.respondWithJson(requests, mockEmptyPage);
-                        expect(pagingContainer.pagingHeader.$('.previous-page-link')).toHaveClass('is-disabled');
+                        expect(LibraryContainer.pagingHeader.$('.previous-page-link')).toHaveClass('is-disabled');
                     });
                 });
 
@@ -249,9 +299,9 @@ define([ "jquery", "underscore", "js/common_helpers/ajax_helpers", "URI", "js/mo
                     it('shows the correct metadata for the current page', function () {
                         var requests = AjaxHelpers.requests(this),
                             message;
-                        pagingContainer.setPage(0);
+                        LibraryContainer.setPage(0);
                         respondWithMockPage(requests);
-                        message = pagingContainer.pagingHeader.$('.meta').html().trim();
+                        message = LibraryContainer.pagingHeader.$('.meta').html().trim();
                         expect(message).toBe('<p>Showing <span class="count-current-shown">1-3</span>' +
                             ' out of <span class="count-total">4 total</span>, ' +
                             'sorted by <span class="sort-order">Date added</span> descending</p>');
@@ -261,53 +311,51 @@ define([ "jquery", "underscore", "js/common_helpers/ajax_helpers", "URI", "js/mo
                 describe("Children count label", function () {
                     it('should show correct count on first page', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(0);
+                        LibraryContainer.setPage(0);
                         respondWithMockPage(requests);
-                        expect(pagingContainer.pagingHeader.$('.count-current-shown')).toHaveHtml('1-3');
+                        expect(LibraryContainer.pagingHeader.$('.count-current-shown')).toHaveHtml('1-3');
                     });
 
                     it('should show correct count on second page', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(1);
+                        LibraryContainer.setPage(1);
                         respondWithMockPage(requests);
-                        expect(pagingContainer.pagingHeader.$('.count-current-shown')).toHaveHtml('4-4');
+                        expect(LibraryContainer.pagingHeader.$('.count-current-shown')).toHaveHtml('4-4');
                     });
 
                     it('should show correct count for an empty collection', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(0);
+                        LibraryContainer.setPage(0);
                         AjaxHelpers.respondWithJson(requests, mockEmptyPage);
-                        expect(pagingContainer.pagingHeader.$('.count-current-shown')).toHaveHtml('0-0');
+                        expect(LibraryContainer.pagingHeader.$('.count-current-shown')).toHaveHtml('0-0');
                     });
                 });
 
                 describe("Children total label", function () {
                     it('should show correct total on the first page', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(0);
+                        LibraryContainer.setPage(0);
                         respondWithMockPage(requests);
-                        expect(pagingContainer.pagingHeader.$('.count-total')).toHaveText('4 total');
+                        expect(LibraryContainer.pagingHeader.$('.count-total')).toHaveText('4 total');
                     });
 
                     it('should show correct total on the second page', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(1);
+                        LibraryContainer.setPage(1);
                         respondWithMockPage(requests);
-                        expect(pagingContainer.pagingHeader.$('.count-total')).toHaveText('4 total');
+                        expect(LibraryContainer.pagingHeader.$('.count-total')).toHaveText('4 total');
                     });
 
                     it('should show zero total for an empty collection', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(0);
+                        LibraryContainer.setPage(0);
                         AjaxHelpers.respondWithJson(requests, mockEmptyPage);
-                        expect(pagingContainer.pagingHeader.$('.count-total')).toHaveText('0 total');
+                        expect(LibraryContainer.pagingHeader.$('.count-total')).toHaveText('0 total');
                     });
                 });
             });
 
             describe("PagingFooter", function () {
-                var pagingFooter;
-
                 beforeEach(function () {
                     var pagingFooterTpl = readFixtures('paging-footer.underscore');
                     appendSetFixtures($("<script>", { id: "paging-footer-tpl", type: "text/template" }).text(pagingFooterTpl));
@@ -316,131 +364,131 @@ define([ "jquery", "underscore", "js/common_helpers/ajax_helpers", "URI", "js/mo
                 describe("Next page button", function () {
                     beforeEach(function () {
                         // Render the page and header so that they can react to events
-                        pagingContainer.render();
+                        LibraryContainer.render();
                     });
 
                     it('does not move forward if a server error occurs', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(0);
+                        LibraryContainer.setPage(0);
                         respondWithMockPage(requests);
-                        pagingContainer.pagingFooter.$('.next-page-link').click();
+                        LibraryContainer.pagingFooter.$('.next-page-link').click();
                         requests[1].respond(500);
-                        expect(pagingContainer.collection.currentPage).toBe(0);
+                        expect(LibraryContainer.collection.currentPage).toBe(0);
                     });
 
                     it('can move to the next page', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(0);
+                        LibraryContainer.setPage(0);
                         respondWithMockPage(requests);
-                        pagingContainer.pagingFooter.$('.next-page-link').click();
+                        LibraryContainer.pagingFooter.$('.next-page-link').click();
                         respondWithMockPage(requests);
-                        expect(pagingContainer.collection.currentPage).toBe(1);
+                        expect(LibraryContainer.collection.currentPage).toBe(1);
                     });
 
                     it('should be enabled when there is at least one more page', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(0);
+                        LibraryContainer.setPage(0);
                         respondWithMockPage(requests);
-                        expect(pagingContainer.pagingFooter.$('.next-page-link')).not.toHaveClass('is-disabled');
+                        expect(LibraryContainer.pagingFooter.$('.next-page-link')).not.toHaveClass('is-disabled');
                     });
 
                     it('should be disabled on the final page', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(1);
+                        LibraryContainer.setPage(1);
                         respondWithMockPage(requests);
-                        expect(pagingContainer.pagingFooter.$('.next-page-link')).toHaveClass('is-disabled');
+                        expect(LibraryContainer.pagingFooter.$('.next-page-link')).toHaveClass('is-disabled');
                     });
 
                     it('should be disabled on an empty page', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(0);
+                        LibraryContainer.setPage(0);
                         AjaxHelpers.respondWithJson(requests, mockEmptyPage);
-                        expect(pagingContainer.pagingFooter.$('.next-page-link')).toHaveClass('is-disabled');
+                        expect(LibraryContainer.pagingFooter.$('.next-page-link')).toHaveClass('is-disabled');
                     });
                 });
 
                 describe("Previous page button", function () {
                     beforeEach(function () {
                         // Render the page and header so that they can react to events
-                        pagingContainer.render();
+                        LibraryContainer.render();
                     });
 
                     it('does not move back if a server error occurs', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(1);
+                        LibraryContainer.setPage(1);
                         respondWithMockPage(requests);
-                        pagingContainer.pagingFooter.$('.previous-page-link').click();
+                        LibraryContainer.pagingFooter.$('.previous-page-link').click();
                         requests[1].respond(500);
-                        expect(pagingContainer.collection.currentPage).toBe(1);
+                        expect(LibraryContainer.collection.currentPage).toBe(1);
                     });
 
                     it('can go back a page', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(1);
+                        LibraryContainer.setPage(1);
                         respondWithMockPage(requests);
-                        pagingContainer.pagingFooter.$('.previous-page-link').click();
+                        LibraryContainer.pagingFooter.$('.previous-page-link').click();
                         respondWithMockPage(requests);
-                        expect(pagingContainer.collection.currentPage).toBe(0);
+                        expect(LibraryContainer.collection.currentPage).toBe(0);
                     });
 
                     it('should be disabled on the first page', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(0);
+                        LibraryContainer.setPage(0);
                         respondWithMockPage(requests);
-                        expect(pagingContainer.pagingFooter.$('.previous-page-link')).toHaveClass('is-disabled');
+                        expect(LibraryContainer.pagingFooter.$('.previous-page-link')).toHaveClass('is-disabled');
                     });
 
                     it('should be enabled on the second page', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(1);
+                        LibraryContainer.setPage(1);
                         respondWithMockPage(requests);
-                        expect(pagingContainer.pagingFooter.$('.previous-page-link')).not.toHaveClass('is-disabled');
+                        expect(LibraryContainer.pagingFooter.$('.previous-page-link')).not.toHaveClass('is-disabled');
                     });
 
                     it('should be disabled for an empty page', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(0);
+                        LibraryContainer.setPage(0);
                         AjaxHelpers.respondWithJson(requests, mockEmptyPage);
-                        expect(pagingContainer.pagingFooter.$('.previous-page-link')).toHaveClass('is-disabled');
+                        expect(LibraryContainer.pagingFooter.$('.previous-page-link')).toHaveClass('is-disabled');
                     });
                 });
 
                 describe("Current page label", function () {
                     it('should show 1 on the first page', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(0);
+                        LibraryContainer.setPage(0);
                         respondWithMockPage(requests);
-                        expect(pagingContainer.pagingFooter.$('.current-page')).toHaveText('1');
+                        expect(LibraryContainer.pagingFooter.$('.current-page')).toHaveText('1');
                     });
 
                     it('should show 2 on the second page', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(1);
+                        LibraryContainer.setPage(1);
                         respondWithMockPage(requests);
-                        expect(pagingContainer.pagingFooter.$('.current-page')).toHaveText('2');
+                        expect(LibraryContainer.pagingFooter.$('.current-page')).toHaveText('2');
                     });
 
                     it('should show 1 for an empty collection', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(0);
+                        LibraryContainer.setPage(0);
                         AjaxHelpers.respondWithJson(requests, mockEmptyPage);
-                        expect(pagingContainer.pagingFooter.$('.current-page')).toHaveText('1');
+                        expect(LibraryContainer.pagingFooter.$('.current-page')).toHaveText('1');
                     });
                 });
 
                 describe("Page total label", function () {
                     it('should show the correct value with more than one page', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(0);
+                        LibraryContainer.setPage(0);
                         respondWithMockPage(requests);
-                        expect(pagingContainer.pagingFooter.$('.total-pages')).toHaveText('2');
+                        expect(LibraryContainer.pagingFooter.$('.total-pages')).toHaveText('2');
                     });
 
                     it('should show page 1 when there are no assets', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(0);
+                        LibraryContainer.setPage(0);
                         AjaxHelpers.respondWithJson(requests, mockEmptyPage);
-                        expect(pagingContainer.pagingFooter.$('.total-pages')).toHaveText('1');
+                        expect(LibraryContainer.pagingFooter.$('.total-pages')).toHaveText('1');
                     });
                 });
 
@@ -449,41 +497,102 @@ define([ "jquery", "underscore", "js/common_helpers/ajax_helpers", "URI", "js/mo
 
                     it('should initially have a blank page input', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(0);
+                        LibraryContainer.setPage(0);
                         respondWithMockPage(requests);
-                        expect(pagingContainer.pagingFooter.$('.page-number-input')).toHaveValue('');
+                        expect(LibraryContainer.pagingFooter.$('.page-number-input')).toHaveValue('');
                     });
 
                     it('should handle invalid page requests', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(0);
+                        LibraryContainer.setPage(0);
                         respondWithMockPage(requests);
-                        pagingContainer.pagingFooter.$('.page-number-input').val('abc');
-                        pagingContainer.pagingFooter.$('.page-number-input').trigger('change');
-                        expect(pagingContainer.collection.currentPage).toBe(0);
-                        expect(pagingContainer.pagingFooter.$('.page-number-input')).toHaveValue('');
+                        LibraryContainer.pagingFooter.$('.page-number-input').val('abc');
+                        LibraryContainer.pagingFooter.$('.page-number-input').trigger('change');
+                        expect(LibraryContainer.collection.currentPage).toBe(0);
+                        expect(LibraryContainer.pagingFooter.$('.page-number-input')).toHaveValue('');
                     });
 
                     it('should switch pages via the input field', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(0);
+                        LibraryContainer.setPage(0);
                         respondWithMockPage(requests);
-                        pagingContainer.pagingFooter.$('.page-number-input').val('2');
-                        pagingContainer.pagingFooter.$('.page-number-input').trigger('change');
+                        LibraryContainer.pagingFooter.$('.page-number-input').val('2');
+                        LibraryContainer.pagingFooter.$('.page-number-input').trigger('change');
                         AjaxHelpers.respondWithJson(requests, mockSecondPage);
-                        expect(pagingContainer.collection.currentPage).toBe(1);
-                        expect(pagingContainer.pagingFooter.$('.page-number-input')).toHaveValue('');
+                        expect(LibraryContainer.collection.currentPage).toBe(1);
+                        expect(LibraryContainer.pagingFooter.$('.page-number-input')).toHaveValue('');
                     });
 
                     it('should handle AJAX failures when switching pages via the input field', function () {
                         var requests = AjaxHelpers.requests(this);
-                        pagingContainer.setPage(0);
+                        LibraryContainer.setPage(0);
                         respondWithMockPage(requests);
-                        pagingContainer.pagingFooter.$('.page-number-input').val('2');
-                        pagingContainer.pagingFooter.$('.page-number-input').trigger('change');
+                        LibraryContainer.pagingFooter.$('.page-number-input').val('2');
+                        LibraryContainer.pagingFooter.$('.page-number-input').trigger('change');
                         requests[1].respond(500);
-                        expect(pagingContainer.collection.currentPage).toBe(0);
-                        expect(pagingContainer.pagingFooter.$('.page-number-input')).toHaveValue('');
+                        expect(LibraryContainer.collection.currentPage).toBe(0);
+                        expect(LibraryContainer.pagingFooter.$('.page-number-input')).toHaveValue('');
+                    });
+                });
+            });
+
+            describe("Previews", function(){
+                describe("toggle_previews", function(){
+                    var oldXBlock,
+                        testSendsAjax,
+                        defaultUrl = "/some/weird/url/you/would/never/set/in/production",
+                        handlerUrlMock = jasmine.createSpy('handlerUrl').andReturn(defaultUrl);
+
+                    beforeEach(function() {
+                        oldXBlock = LibraryContainer.xblock;
+                        LibraryContainer.xblock = {
+                            element: $('<div/>'),
+                            runtime: {
+                                handlerUrl: handlerUrlMock
+                            }
+                        }
+                    });
+
+                    afterEach(function() {
+                        LibraryContainer.xblock = oldXBlock;
+                    });
+
+                    testSendsAjax = function (show_previews) {
+                        it("should send " + (!show_previews) + " when show_children_previews was " + show_previews, function(){
+                            var requests = AjaxHelpers.requests(this);
+                            LibraryContainer.collection.show_children_previews = show_previews;
+                            LibraryContainer.toggle_previews();
+
+                            expect(handlerUrlMock).toHaveBeenCalledWith(
+                                LibraryContainer.xblock.element, 'trigger_previews'
+                            );
+                            AjaxHelpers.expectJsonRequest(requests, 'POST', defaultUrl, { show_children_previews: !show_previews});
+                            AjaxHelpers.respondWithJson(requests, { show_children_previews: !show_previews });
+
+                            LibraryContainer.collection.show_children_previews = true;
+                        });
+                    };
+                    testSendsAjax(true);
+                    testSendsAjax(false);
+
+                    it("should trigger render on success", function(){
+                        spyOn(LibraryContainer, 'render');
+                        var requests = AjaxHelpers.requests(this);
+
+                        LibraryContainer.toggle_previews();
+                        AjaxHelpers.respondWithJson(requests, { show_children_previews: true });
+
+                        expect(LibraryContainer.render).toHaveBeenCalled();
+                    });
+
+                    it("should not trigger render on failure", function(){
+                        spyOn(LibraryContainer, 'render');
+                        var requests = AjaxHelpers.requests(this);
+
+                        LibraryContainer.toggle_previews();
+                        AjaxHelpers.respondWithError(requests);
+
+                        expect(LibraryContainer.render).not.toHaveBeenCalled();
                     });
                 });
             });
diff --git a/cms/static/js/spec/views/pages/container_spec.js b/cms/static/js/spec/views/pages/container_spec.js
index 6f4b4baf46af..ba65201a1ad1 100644
--- a/cms/static/js/spec/views/pages/container_spec.js
+++ b/cms/static/js/spec/views/pages/container_spec.js
@@ -7,7 +7,7 @@ define(["jquery", "underscore", "underscore.string", "js/common_helpers/ajax_hel
             describe(label + " ContainerPage", function () {
                 var lastRequest, getContainerPage, renderContainerPage, expectComponents, respondWithHtml,
                     model, containerPage, requests, initialDisplayName,
-                    mockContainerPage = readFixtures('mock/mock-container-page.underscore'),
+                    mockContainerPage = readFixtures(fixtures.container),
                     mockContainerXBlockHtml = readFixtures(fixtures.initial),
                     mockXBlockHtml = readFixtures(fixtures.add_response),
                     mockBadContainerXBlockHtml = readFixtures('mock/mock-bad-javascript-container-xblock.underscore'),
@@ -546,17 +546,63 @@ define(["jquery", "underscore", "underscore.string", "js/common_helpers/ajax_hel
                         });
                     });
                 });
+
+                if (global_page_options.is_library) {
+                    describe("Previews", function(){
+
+                        var getButtonIcon, getButtonText;
+
+                        getButtonIcon = function(containerPage){
+                            return containerPage.$('.action-toggle-preview .preview-arrow');
+                        };
+
+                        getButtonText = function(containerPage) {
+                            return containerPage.$('.action-toggle-preview .preview-text').text().trim();
+                        };
+
+                        it('initially shows loading icon and reads "Loading..."', function(){
+                            containerPage = getContainerPage();
+                            expect(getButtonIcon(containerPage)).toHaveClass('icon-refresh');
+                            expect(getButtonText(containerPage)).toBe("${_('Loading...')}");
+                        });
+
+                        function updatePreviewButtonTest(label, show_previews, expected_icon_class, expected_text){
+                            it('can set preview button to '+label, function (){
+                                containerPage = getContainerPage();
+                                containerPage.updatePreviewButton(show_previews);
+                                expect(getButtonIcon(containerPage)).toHaveClass(expected_icon_class);
+                                expect(getButtonText(containerPage)).toBe(expected_text);
+                            });
+                        }
+                        updatePreviewButtonTest('show previews', true, 'icon-arrow-up', 'Hide Previews');
+                        updatePreviewButtonTest('hide previews', false, 'icon-arrow-down', 'Show Previews');
+
+                        it('triggers underlying view toggle_previews when preview button clicked', function() {
+                            containerPage = getContainerPage();
+                            containerPage.render();
+                            spyOn(containerPage.xblockView, 'toggle_previews');
+
+                            containerPage.$('.toggle-preview-button').click();
+                            expect(containerPage.xblockView.toggle_previews).toHaveBeenCalled();
+                        });
+                    });
+                }
             });
         }
 
-        parameterized_suite("Non paged",
+        parameterized_suite("Course",
             { enable_paging: false },
-            { initial: 'mock/mock-container-xblock.underscore', add_response: 'mock/mock-xblock.underscore' }
+            {
+                initial: 'mock/mock-container-xblock.underscore',
+                add_response: 'mock/mock-xblock.underscore',
+                container: 'mock/mock-container-page.underscore'
+            }
         );
-        parameterized_suite("Paged",
-            { enable_paging: true, page_size: 42 },
+        parameterized_suite("Library",
+            { is_library: true, page_size: 42 },
             {
-                initial: 'mock/mock-container-paged-xblock.underscore',
-                add_response: 'mock/mock-container-paged-after-add-xblock.underscore'
+                initial: 'mock/mock-container-library-xblock.underscore',
+                add_response: 'mock/mock-container-library-after-add-xblock.underscore',
+                container: 'mock/mock-container-page-library.underscore'
             });
     });
diff --git a/cms/static/js/views/paged_container.js b/cms/static/js/views/library_container.js
similarity index 79%
rename from cms/static/js/views/paged_container.js
rename to cms/static/js/views/library_container.js
index b80ef62b2774..3718a268a5e6 100644
--- a/cms/static/js/views/paged_container.js
+++ b/cms/static/js/views/library_container.js
@@ -1,7 +1,7 @@
 define(["jquery", "underscore", "js/views/xblock", "js/utils/module", "gettext", "js/views/feedback_notification",
         "js/views/paging_header", "js/views/paging_footer"],
     function ($, _, XBlockView, ModuleUtils, gettext, NotificationView, PagingHeader, PagingFooter) {
-        var PagedContainerView = XBlockView.extend({
+        var LibraryContainerView = XBlockView.extend({
             // Store the request token of the first xblock on the page (which we know was rendered by Studio when
             // the page was generated). Use that request token to filter out user-defined HTML in any
             // child xblocks within the page.
@@ -11,9 +11,8 @@ define(["jquery", "underscore", "js/views/xblock", "js/utils/module", "gettext",
                 var self = this;
                 XBlockView.prototype.initialize.call(this);
                 this.page_size = this.options.page_size || 10;
-                if (options) {
-                    this.page_reload_callback = options.page_reload_callback;
-                }
+                this.page_reload_callback = this.options.page_reload_callback || function() {};
+                this.update_previews_callback = this.options.update_previews_callback || function() {};
                 // emulating Backbone.paginator interface
                 this.collection = {
                     currentPage: 0,
@@ -22,6 +21,7 @@ define(["jquery", "underscore", "js/views/xblock", "js/utils/module", "gettext",
                     sortDirection: "desc",
                     start: 0,
                     _size: 0,
+                    show_children_previews: true,
 
                     bind: function() {},  // no-op
                     size: function() { return self.collection._size; }
@@ -40,12 +40,9 @@ define(["jquery", "underscore", "js/views/xblock", "js/utils/module", "gettext",
             },
 
             renderPage: function(options){
-                var self = this,
-                    view = this.view,
-                    xblockInfo = this.model,
-                    xblockUrl = xblockInfo.url();
+                var self = this;
                 return $.ajax({
-                    url: decodeURIComponent(xblockUrl) + "/" + view,
+                    url: decodeURIComponent(this.model.url()) + "/" + this.view,
                     type: 'GET',
                     cache: false,
                     data: this.getRenderParameters(options.page_number),
@@ -53,9 +50,10 @@ define(["jquery", "underscore", "js/views/xblock", "js/utils/module", "gettext",
                     success: function(fragment) {
                         self.handleXBlockFragment(fragment, options);
                         self.processPaging({ requested_page: options.page_number });
-                        if (options.paging && self.page_reload_callback){
+                        if (options.paging) {
                             self.page_reload_callback(self.$el);
                         }
+                        self.update_previews_callback(self.collection.show_children_previews);
                     }
                 });
             },
@@ -96,15 +94,14 @@ define(["jquery", "underscore", "js/views/xblock", "js/utils/module", "gettext",
 
             processPaging: function(options){
                 var $element = this.$el.find('.xblock-container-paging-parameters'),
-                    total = $element.data('total'),
-                    displayed = $element.data('displayed'),
-                    start = $element.data('start');
+                    total = $element.data('total');
 
                 this.collection.currentPage = options.requested_page;
                 this.collection.totalCount = total;
                 this.collection.totalPages = this.getPageCount(total);
-                this.collection.start = start;
-                this.collection._size = displayed;
+                this.collection.start = $element.data('start');
+                this.collection._size = $element.data('displayed');
+                this.collection.show_children_previews = $element.data('previews');
 
                 this.processPagingHeaderAndFooter();
             },
@@ -157,8 +154,26 @@ define(["jquery", "underscore", "js/views/xblock", "js/utils/module", "gettext",
 
             sortDisplayName: function() {
                 return "Date added";  // TODO add support for sorting
+            },
+
+            toggle_previews: function(){
+                var self = this,
+                    runtime = this.xblock && this.xblock.runtime;
+                if (runtime) {
+                    return $.ajax({
+                        url: runtime.handlerUrl(this.xblock.element, 'trigger_previews'),
+                        type: 'POST',
+                        data: JSON.stringify({ show_children_previews: !this.collection.show_children_previews}),
+                        dataType: 'json'
+                    })
+                    .then(self.render)
+                    .promise();
+                }
+                else{
+                    return $.Deferred().resolve(this.collection.show_children_previews).promise();
+                }
             }
         });
 
-        return PagedContainerView;
+        return LibraryContainerView;
     }); // end define();
diff --git a/cms/static/js/views/pages/container.js b/cms/static/js/views/pages/container.js
index b41c1af22b10..85c321eefd46 100644
--- a/cms/static/js/views/pages/container.js
+++ b/cms/static/js/views/pages/container.js
@@ -3,10 +3,10 @@
  * This page allows the user to understand and manipulate the xblock and its children.
  */
 define(["jquery", "underscore", "gettext", "js/views/pages/base_page", "js/views/utils/view_utils",
-        "js/views/container", "js/views/paged_container", "js/views/xblock", "js/views/components/add_xblock", "js/views/modals/edit_xblock",
+        "js/views/container", "js/views/library_container", "js/views/xblock", "js/views/components/add_xblock", "js/views/modals/edit_xblock",
         "js/models/xblock_info", "js/views/xblock_string_field_editor", "js/views/pages/container_subviews",
         "js/views/unit_outline", "js/views/utils/xblock_utils"],
-    function ($, _, gettext, BasePage, ViewUtils, ContainerView, PagedContainerView, XBlockView, AddXBlockComponent,
+    function ($, _, gettext, BasePage, ViewUtils, ContainerView, LibraryContainerView, XBlockView, AddXBlockComponent,
               EditXBlockModal, XBlockInfo, XBlockStringFieldEditor, ContainerSubviews, UnitOutlineView,
               XBlockUtils) {
         'use strict';
@@ -16,7 +16,8 @@ define(["jquery", "underscore", "gettext", "js/views/pages/base_page", "js/views
             events: {
                 "click .edit-button": "editXBlock",
                 "click .duplicate-button": "duplicateXBlock",
-                "click .delete-button": "deleteXBlock"
+                "click .delete-button": "deleteXBlock",
+                "click .toggle-preview-button": "toggleChildrenPreviews"
             },
 
             options: {
@@ -27,8 +28,8 @@ define(["jquery", "underscore", "gettext", "js/views/pages/base_page", "js/views
 
             initialize: function(options) {
                 BasePage.prototype.initialize.call(this, options);
-                this.enable_paging = options.enable_paging || false;
-                if (this.enable_paging) {
+                this.is_library = options.is_library || false;
+                if (this.is_library) {
                     this.page_size = options.page_size || 10;
                 }
                 this.nameEditor = new XBlockStringFieldEditor({
@@ -83,15 +84,19 @@ define(["jquery", "underscore", "gettext", "js/views/pages/base_page", "js/views
                         view: this.view
                     };
 
-                if (this.enable_paging) {
+                if (this.is_library) {
                     parameters = _.extend(parameters, {
                         page_size: this.page_size,
+                        children_previews: this.children_previews,
                         page_reload_callback: function($element) {
                             self.renderAddXBlockComponents();
                             self.addButtonActions($element);
+                        },
+                        update_previews_callback: function(show_children_previews) {
+                            self.updatePreviewButton(show_children_previews);
                         }
                     });
-                    return new PagedContainerView(parameters);
+                    return new LibraryContainerView(parameters);
                 }
                 else {
                     return new ContainerView(parameters);
@@ -105,6 +110,10 @@ define(["jquery", "underscore", "gettext", "js/views/pages/base_page", "js/views
                     unitLocationTree = this.$('.unit-location'),
                     hiddenCss='is-hidden';
 
+                if (this.toggle_previews){
+                    this.updatePreviewButton();
+                }
+
                 loadingElement.removeClass(hiddenCss);
 
                 // Hide both blocks until we know which one to show
@@ -160,6 +169,15 @@ define(["jquery", "underscore", "gettext", "js/views/pages/base_page", "js/views
                 });
             },
 
+            updatePreviewButton: function(show_previews){
+                var text = (show_previews) ? gettext('Hide Previews') : gettext('Show Previews'),
+                    icon_class = (show_previews) ? 'icon-arrow-up' : 'icon-arrow-down',
+                    button = $('.nav-actions .button-toggle-preview');
+
+                this.$(".preview-arrow", button).removeClass("icon-arrow-down icon-arrow-up").addClass(icon_class);
+                this.$(".preview-text", button).text(text);
+            },
+
             editXBlock: function(event) {
                 var xblockElement = this.findXBlockElement(event.target),
                     self = this,
@@ -242,6 +260,13 @@ define(["jquery", "underscore", "gettext", "js/views/pages/base_page", "js/views
                 });
             },
 
+            toggleChildrenPreviews: function(xblockElement) {
+                // TODO: this ignores xblockElement as it's always a top level control for now. This might change in the future
+                if (this.xblockView.toggle_previews) {
+                    this.xblockView.toggle_previews();
+                }
+            },
+
             onDelete: function(xblockElement) {
                 // get the parent so we can remove this component from its parent.
                 var xblockView = this.xblockView,
diff --git a/cms/templates/js/mock/mock-container-paged-after-add-xblock.underscore b/cms/templates/js/mock/mock-container-library-after-add-xblock.underscore
similarity index 100%
rename from cms/templates/js/mock/mock-container-paged-after-add-xblock.underscore
rename to cms/templates/js/mock/mock-container-library-after-add-xblock.underscore
diff --git a/cms/templates/js/mock/mock-container-paged-xblock.underscore b/cms/templates/js/mock/mock-container-library-xblock.underscore
similarity index 100%
rename from cms/templates/js/mock/mock-container-paged-xblock.underscore
rename to cms/templates/js/mock/mock-container-library-xblock.underscore
diff --git a/cms/templates/js/mock/mock-container-page-library.underscore b/cms/templates/js/mock/mock-container-page-library.underscore
new file mode 100644
index 000000000000..6c72e2db7109
--- /dev/null
+++ b/cms/templates/js/mock/mock-container-page-library.underscore
@@ -0,0 +1,68 @@
+<div id="content">
+
+    <div class="wrapper-mast wrapper" data-location="" data-display-name="" data-category="">
+        <header class="mast has-actions has-navigation">
+            <div class="page-header">
+                <small class="navigation navigation-parents subtitle">
+                    <a href="/unit/TestCourse/branch/draft/block/vertical8eb" class="navigation-item navigation-link navigation-parent">Unit 1</a>
+                </small>
+                <div class="wrapper-xblock-field is-editable" data-field="display_name">
+                    <h1 class="page-header-title xblock-field-value">Test Container</h1>
+                </div>
+            </div>
+
+            <nav class="nav-actions">
+                <h3 class="sr">${_("Page Actions")}</h3>
+                <ul>
+                    <li class="action-item action-toggle-preview nav-item">
+                        <a href="#" class="button button-toggle-preview action-button toggle-preview-button">
+                            <i class="icon-refresh preview-arrow"></i>
+                            <span class="action-button-text preview-text">${_('Loading...')}</span>
+                        </a>
+                    </li>
+                    <li class="action-item action-edit nav-item">
+                        <a href="#" class="button edit-button action-button">
+                            <i class="icon-pencil"></i>
+                            <span class="action-button-text">${_("Edit")}</span>
+                        </a>
+                    </li>
+                </ul>
+            </nav>
+        </header>
+    </div>
+
+    <div class="wrapper-content wrapper">
+        <div class="inner-wrapper">
+            <section class="content-area">
+
+                <article class="content-primary window">
+                    <div class="container-message wrapper-message"></div>
+                    <section class="wrapper-xblock level-page studio-xblock-wrapper" data-locator="locator-container">
+                    </section>
+                    <div class="ui-loading is-hidden">
+                        <p><span class="spin"><i class="icon-refresh"></i></span> <span class="copy">Loading...</span></p>
+                    </div>
+                </article>
+                <aside class="content-supplementary" role="complimentary">
+                    <div id="publish-unit" class="window"></div>
+                    <div id="publish-history"></div>
+                </aside>
+                <div class="unit-location">
+                        <h4 class="header">${_("Unit Location")}</h4>
+                        <div class="wrapper-unit-id content-bit">
+                            <h5 class="title">Unit Location ID</h5>
+                            <p class="unit-id">
+                                <span class="unit-id-value" id="unit-location-id-input">${unit.location.name}</span>
+                                <span class="tip"><span class="sr">Tip: </span>${_("Use this ID when you create links to this unit from other course content. You enter the ID in the URL field.")}</span>
+                            </p>
+                        </div>
+                        <div class="wrapper-unit-tree-location bar-mod-content">
+                            <h5 class="title">Location in Course Outline</h5>
+                            <div class="wrapper-unit-overview">
+                            </div>
+                        </div>
+                    </div>
+            </section>
+        </div>
+    </div>
+</div>
diff --git a/cms/templates/library.html b/cms/templates/library.html
index f3d2f5473948..08dc01806a42 100644
--- a/cms/templates/library.html
+++ b/cms/templates/library.html
@@ -32,7 +32,7 @@
             ${component_templates | n}, ${json.dumps(xblock_info) | n}, "${action}",
             {
                 isUnitPage: false,
-                enable_paging: true,
+                is_library: true,
                 page_size: 10
             }
         );
@@ -54,6 +54,12 @@ <h1 class="page-header-title xblock-field-value incontext-editor-value"><span cl
         <nav class="nav-actions">
             <h3 class="sr">${_("Page Actions")}</h3>
             <ul>
+                <li class="action-item action-toggle-preview nav-item">
+                    <a href="#" class="button button-toggle-preview action-button toggle-preview-button">
+                        <i class="icon-refresh preview-arrow"></i>
+                        <span class="action-button-text preview-text">${_('Loading...')}</span>
+                    </a>
+                </li>
                 <li class="action-item action-edit nav-item">
                     <a href="#" class="button button-edit action-button edit-button">
                         <i class="icon-pencil"></i>
diff --git a/cms/templates/studio_xblock_wrapper.html b/cms/templates/studio_xblock_wrapper.html
index 4ad50666d57c..b06918ecee0c 100644
--- a/cms/templates/studio_xblock_wrapper.html
+++ b/cms/templates/studio_xblock_wrapper.html
@@ -107,14 +107,16 @@
     <div class="wrapper-xblock-message xblock-validation-messages" data-locator="${xblock.location | h}"/>
 % endif
 
-% if is_root or not xblock_url:
-    <article class="xblock-render">
-    ${content}
-    </article>
-% else:
-    <div class="xblock-message-area">
-    ${content}
-% endif
+% if xblock_context.get('show_preview', True):
+    % if is_root or not xblock_url:
+        <article class="xblock-render">
+        ${content}
+        </article>
+    % else:
+        <div class="xblock-message-area">
+        ${content}
+    % endif
+ % endif   
 
 % if not is_root:
     </section>
diff --git a/common/lib/xmodule/xmodule/library_module.py b/common/lib/xmodule/xmodule/library_module.py
index 14c37df4dae4..2a7a63d82975 100644
--- a/common/lib/xmodule/xmodule/library_module.py
+++ b/common/lib/xmodule/xmodule/library_module.py
@@ -11,8 +11,9 @@
 
 from xmodule.vertical_module import VerticalDescriptor, VerticalModule
 
-from xblock.fields import Scope, String, List
+from xblock.fields import Scope, String, List, Boolean
 from xblock.fragment import Fragment
+from xmodule.library_content_module import XBlock
 
 log = logging.getLogger(__name__)
 
@@ -35,6 +36,12 @@ class LibraryFields(object):
         help=_("Enter the names of the advanced components to use in your library."),
         scope=Scope.settings
     )
+    show_children_previews = Boolean(
+        display_name=_("Hide children preview"),
+        help=_("Choose if preview of library contents is shown"),
+        scope=Scope.user_state,
+        default=True
+    )
     has_children = True
 
 
@@ -71,7 +78,7 @@ def render_children(self, context, fragment, can_reorder=False, can_add=False):
         for child_key in children_to_show:  # pylint: disable=E1101
             child = self.runtime.get_block(child_key)
             child_view_name = LibraryModule.get_preview_view_name(child)
-            rendered_child = self.runtime.render_child(child, child_view_name, context)
+            rendered_child = self.render_child(child, child_view_name, context)
             fragment.add_frag_resources(rendered_child)
 
             contents.append({
@@ -87,11 +94,31 @@ def render_children(self, context, fragment, can_reorder=False, can_add=False):
                 'can_reorder': False,
                 'first_displayed': item_start,
                 'total_children': children_count,
-                'displayed_children': len(children_to_show)
-            }
-        ))
-
-
+                'displayed_children': len(children_to_show),
+                'previews': self.show_children_previews
+            })
+        )
+
+    def render_child(self, child, child_view_name, context):
+        child_context = context.copy()  # shallow copy should be enough
+        if not self.show_children_previews:
+            child_context['show_preview'] = False
+        return self.runtime.render_child(child, child_view_name, child_context)
+        # if self.show_children_previews:
+        #     return self.runtime.render_child(child, child_view_name, context)
+        # else:
+        #     template_context = {
+        #         'xblock_context': context,
+        #         'xblock': child,
+        #         'content': "",
+        #         'is_root': False,
+        #         'is_reorderable': False,
+        #     }
+        #     html = self.system.render_template('studio_xblock_wrapper.html', template_context)
+        #     return Fragment(content=html)
+
+
+@XBlock.wants('user')
 class LibraryDescriptor(LibraryFields, VerticalDescriptor):
     """
     Descriptor for our library XBlock/XModule.
@@ -132,3 +159,14 @@ def from_xml(cls, xml_data, system, id_generator):
     def export_to_xml(self, resource_fs):
         """ XML support not yet implemented. """
         raise NotImplementedError
+
+    @XBlock.json_handler
+    def trigger_previews(self, request_body, suffix):
+        self.show_children_previews = request_body.get('show_children_previews', self.show_children_previews)
+        user_id = self.runtime.service(self, 'user').user_id
+        self.system.modulestore.update_item(self, user_id)
+        return {'show_children_previews': self.show_children_previews}
+
+
+
+
diff --git a/lms/templates/studio_render_paged_children_view.html b/lms/templates/studio_render_paged_children_view.html
index 12ea1ba21d1b..b958549a1d0a 100644
--- a/lms/templates/studio_render_paged_children_view.html
+++ b/lms/templates/studio_render_paged_children_view.html
@@ -8,7 +8,12 @@
 </script>
 % endfor
 
-<div class="xblock-container-paging-parameters" data-start="${first_displayed}" data-displayed="${displayed_children}" data-total="${total_children}"></div>
+<div class="xblock-container-paging-parameters"
+     data-start="${first_displayed}"
+     data-displayed="${displayed_children}"
+     data-total="${total_children}"
+     data-previews="${'true' if previews else 'false'}"
+></div>
 
 <div class="container-paging-header"></div>