diff --git a/app/app/styles/app.scss b/app/app/styles/app.scss
index aadb56c4..58046da0 100644
--- a/app/app/styles/app.scss
+++ b/app/app/styles/app.scss
@@ -28,3 +28,4 @@
 @import "view/document/editor.scss";
 @import "view/document/wizard.scss";
 @import "vendor.scss";
+@import "responsive.scss";
diff --git a/app/app/styles/responsive.scss b/app/app/styles/responsive.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/app/app/templates/components/document/document-sidebar-toc.hbs b/app/app/templates/components/document/document-sidebar-toc.hbs
index 7ed96ad4..a4d31153 100644
--- a/app/app/templates/components/document/document-sidebar-toc.hbs
+++ b/app/app/templates/components/document/document-sidebar-toc.hbs
@@ -1,5 +1,4 @@
-<div class="document-structure">
-
+<div class="document-structure hidden-xs hidden-sm">
     {{#if this.session.authenticated}}
         <div id="tocToolbar" class="toc-controls {{if actionablePage 'current-page' ''}}">
             <div id="toc-up-button" class="round-button-mono {{if upDisabled 'disabled'}}" data-tooltip="Move up" data-tooltip-position="top center" {{action 'pageUp'}}>
@@ -28,5 +27,4 @@
             </li>
         {{/each}}
     </ul>
-
 </div>
diff --git a/app/app/templates/components/document/document-toolbar.hbs b/app/app/templates/components/document/document-toolbar.hbs
index b51054f0..d826ba48 100644
--- a/app/app/templates/components/document/document-toolbar.hbs
+++ b/app/app/templates/components/document/document-toolbar.hbs
@@ -4,7 +4,7 @@
 			<div class="toolbar">
 
 				{{#if session.authenticated}}
-					<div class="meta-data pull-left">
+					<div class="meta-data pull-left hidden-xs hidden-sm">
 					    <ul class="items">
 							<li class="item">
 								<div id="owner-avatar" class="avatar" data-tooltip="{{owner.fullname}}" data-tooltip-position="right middle">{{owner.initials}}</div>
@@ -37,7 +37,7 @@
 					</div>
 				{{/if}}
 
-				<div class="actions pull-right hidden-xs">
+				<div class="actions pull-right hidden-xs hidden-sm">
 	                {{#if isEditor}}
 						{{#link-to 'document.wizard' folder.id folder.slug document.id document.slug}}
 							<div class="square-button button-green" id="add-section-button" data-tooltip="Add section" data-tooltip-position="top center">
@@ -102,39 +102,3 @@
 		</div>
 	</div>
 </div>
-
-<!--
-{{#if normalMode}}
-	<div class="edit-toolbox in-edit-toolbar">
-		<ul>
-			{{#if isEditor}}
-				<li class="tooltipped in-edit-toolbar" data-tooltip="Edit section" {{action 'editPage' editModePageId }}>
-					<i class="material-icons in-edit-toolbar">create</i>
-				</li>
-				{{#if editModeHasHistory}}
-					<li class="tooltipped in-edit-toolbar" data-tooltip="View changes" {{action 'viewHistory' editModePageId }}>
-						<i class="material-icons in-edit-toolbar">history</i>
-					</li>
-				{{/if}}
-				{{#if editModeCanDelete}}
-					<li class="tooltipped in-edit-toolbar" data-tooltip="Delete section" {{action 'askDeletePage' editModePageId }}>
-						<i class="material-icons in-edit-toolbar">delete</i>
-					</li>
-				{{/if}}
-				<li class="tooltipped in-edit-toolbar dropdown-content-type-trigger" data-tooltip="Insert section" data-activates="dropdown-content-type" data-alignment="right">
-					<i class="material-icons in-edit-toolbar">add</i>
-				</li>
-			{{/if}}
-		</ul>
-	</div>
-	<ul id="dropdown-content-type" class="dropdown-content">
-		<li><a {{action 'addPage' editModePageId "wysiwyg"}}>Text</a></li>
-		<li><a {{action 'addPage' editModePageId "table"}}>Table</a></li>
-		<li><a {{action 'addPage' editModePageId "code"}}>Code</a></li>
-	</ul>
-{{/if}}
-
-<div id="modal-history" class="modal bottom-sheet bottom-dialog">
-    {{document/editor-history model=historyModel editorClose=(action 'onEditorHistoryClose') editorAction=(action 'onEditorHistoryAction') }}
-</div>
--->
diff --git a/app/app/templates/components/document/page-heading.hbs b/app/app/templates/components/document/page-heading.hbs
index 38ee4a09..016d16c0 100644
--- a/app/app/templates/components/document/page-heading.hbs
+++ b/app/app/templates/components/document/page-heading.hbs
@@ -1,6 +1,6 @@
 <div class="page-title">
     <span id="page-title-{{ page.id }}">{{ page.title }}</span>
-    <div id="page-toolbar-{{ page.id }}" class="pull-right page-toolbar">
+    <div id="page-toolbar-{{ page.id }}" class="pull-right page-toolbar hidden-xs hidden-sm">
         {{#if isEditor}}
 			{{#link-to 'document.edit' folder.id folder.slug document.id document.slug page.id}}
 	            <div class="round-button-mono page-edit-button" data-tooltip="Edit" data-tooltip-position="top center">
diff --git a/app/app/templates/components/folder/folder-dashboard.hbs b/app/app/templates/components/folder/folder-dashboard.hbs
index 8ac9b347..2244aaee 100644
--- a/app/app/templates/components/folder/folder-dashboard.hbs
+++ b/app/app/templates/components/folder/folder-dashboard.hbs
@@ -1,4 +1,4 @@
-<div class="pull-right">
+<div class="pull-right hidden-xs hidden-sm">
     {{#if hasSelectedDocuments}}
 		<div class="square-button button-blue" id="move-documents-button" data-tooltip="Move documents" data-tooltip-position="top center">
 		    <i class="material-icons">folder</i>
diff --git a/app/app/templates/components/folder/folders-list.hbs b/app/app/templates/components/folder/folders-list.hbs
index 170840ca..23904f60 100644
--- a/app/app/templates/components/folder/folders-list.hbs
+++ b/app/app/templates/components/folder/folders-list.hbs
@@ -1,17 +1,19 @@
-{{#if session.isEditor}}
-	<div class="round-button-mono" id="add-folder-button" data-tooltip="New space" data-tooltip-position="top center">
-		<i class="material-icons">add</i>
-	</div>
-	{{#dropdown-dialog target="add-folder-button" position="bottom left" button="Add" color="flat-green" onAction=(action 'addFolder') focusOn="new-folder-name"}}
-		<div>
-			<div class="input-control">
-				<label>New space</label>
-        		<div class="tip">A repository for related documentation</div>
-				{{input type='text' id="new-folder-name" value=newFolder}}
-			</div>
+<span class="hidden-xs hidden-sm">
+	{{#if session.isEditor}}
+		<div class="round-button-mono" id="add-folder-button" data-tooltip="New space" data-tooltip-position="top center">
+			<i class="material-icons">add</i>
 		</div>
-	{{/dropdown-dialog}}
-{{/if}}
+		{{#dropdown-dialog target="add-folder-button" position="bottom left" button="Add" color="flat-green" onAction=(action 'addFolder') focusOn="new-folder-name"}}
+			<div>
+				<div class="input-control">
+					<label>New space</label>
+					<div class="tip">A repository for related documentation</div>
+					{{input type='text' id="new-folder-name" value=newFolder}}
+				</div>
+			</div>
+		{{/dropdown-dialog}}
+	{{/if}}
+</span>
 
 <div class="folders-list">
 	<div class="section">
@@ -59,6 +61,6 @@
 	{{/if}}
 </div>
 
-<div class="copyright">
+<div class="copyright hidden-xs hidden-sm">
 	<a href="https://documize.com?ref=app-footer" target="_blank">Copyright&nbsp;&copy;&nbsp;2016 Documize</a>
 </div>