diff --git a/appinfo/info.xml b/appinfo/info.xml
index 694e3d3..957bd1a 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -5,7 +5,7 @@
     <description>Quick notes with text, check lists and pictures</description>
     <licence>AGPL</licence>
     <author>Matias De lellis</author>
-    <version>0.1.1</version>
+    <version>0.1.2</version>
     <namespace>QuickNotes</namespace>
     <category>tool</category>
     <website>https://github.com/matiasdelellis</website>
@@ -14,6 +14,6 @@
     <ocsid>174716</ocsid>
     <dependencies>
         <owncloud min-version="8.0" max-version="9.1"/>
-        <nextcloud min-version="9" max-version="12" />
+        <nextcloud min-version="9" max-version="13" />
     </dependencies>
 </info>
diff --git a/css/style.css b/css/style.css
index 812e951..820f5d2 100644
--- a/css/style.css
+++ b/css/style.css
@@ -51,10 +51,6 @@
   /*width: 100%;*/
 }
 
-.note-active #content-editable {
-/*    margin-bottom: 60px;*/
-}
-
 .save-button #unshare-button {
     display: none;
 }
@@ -74,6 +70,10 @@
 
 /* Grid Note */
 
+#div-content {
+    width: 100%;
+}
+
 #div-content .note-title {
    font-size: 18px;
    font-weight: bold;
@@ -82,6 +82,11 @@
    overflow: hidden;
 }
 
+
+.note-content {
+    margin: 4px;
+}
+
 #div-content .shared-title,
 #div-content .shared-title-owner,
 #div-content .icon-delete-note {
@@ -110,6 +115,8 @@
    width:20px;
    height:20px;
    min-width: 20px;
+   min-height: 16px;
+   padding: unset;
    border-radius:10px;
    border: 1px solid rgba(0, 0, 0, 0.2);
 }
@@ -157,8 +164,17 @@
 }
 
 #content-editable {
+    width: 100%;
     min-height: 50px;
     word-wrap: break-word;
+    background: none;
+    border: none;
+}
+
+#title-editable {
+    width: 100%;
+    background: none;
+    border: none;
 }
 
 .note-options {
diff --git a/js/script.js b/js/script.js
index 2c99481..69a8a91 100644
--- a/js/script.js
+++ b/js/script.js
@@ -1,11 +1,11 @@
 /**
- * ownCloud - quicknotes
+ * NextCloud/ownCloud - quicknotes
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Matias De lellis <mati86dl@gmail.com>
- * @copyright Matias De lellis 2016-2017
+ * @copyright Matias De lellis 2016-2018
  */
 
 (function (OC, window, $, undefined) {
@@ -248,19 +248,11 @@ View.prototype = {
                 buttons: [
                     'bold',
                     'italic',
-                    {
-                        name: 'h1',
-                        action: 'append-h2',
-                        aria: 'header type 1',
-                        tagNames: ['h2'],
-                        contentDefault: '<h2>H</h2>',
-                        attrs: {
-                            'data-custom-attr': 'attr-value-h1'
-                        }
-                    },
-                    'justifyLeft', 'justifyCenter', 'justifyRight',
+                    'underline',
+                    'strikethrough',
                     'unorderedlist','orderedlist',
-                    'quote'
+                    'quote',
+                    'removeFormat'
                ]
             },
             autoLink: true,
diff --git a/templates/part.navigation.php b/templates/part.navigation.php
index 8535b33..7034eb1 100644
--- a/templates/part.navigation.php
+++ b/templates/part.navigation.php
@@ -6,8 +6,10 @@
 		<div><button type="button" id="new-note" class="icon-add"><?php p($l->t('New note'));?></button></div>
 	</div>
 	<li id="all-notes"><a href="#" class="icon-home svg"><?php p($l->t('All notes')); ?></a></li>
+	<!--
 	<li id="shared-with-you"><a href="#" class="icon-share svg"><?php p($l->t('Shared with you')); ?></a></li>
 	<li id="shared-by-you"><a href="#" class="icon-share svg"><?php p($l->t('Shared with others')); ?></a></li>
+	-->
 	<li id="colors-folder" class="collapsible open">
 		<button class="collapse"></button>
 		<a href="#" class="icon-search svg"><?php p($l->t('Colors')); ?></a>
@@ -27,6 +29,7 @@
 			{{#each notes}}
 				<li class="note with-menu {{#if active}}active{{/if}}"  data-id="{{ id }}">
 					<a href="#">{{{ title }}}</a>
+					<!--
 					<div class="app-navigation-entry-utils">
 						<ul>
 							<li class="app-navigation-entry-utils-menu-button svg"><button></button></li>
@@ -37,6 +40,7 @@
 							<li><button class="delete icon-delete svg" title="delete"></button></li>
 						</ul>
 					</div>
+					-->
 				</li>
 			{{/each}}
 		</ul>
diff --git a/templates/part.note-modal-editable.php b/templates/part.note-modal-editable.php
index dccb146..1965180 100644
--- a/templates/part.note-modal-editable.php
+++ b/templates/part.note-modal-editable.php
@@ -5,11 +5,14 @@
 			<div contenteditable="true" id='content-editable' class='note-content' data-placeholder="No content"></div>
 			<div class="note-options">
 				<div class="save-button">
+					<!--
 					<button id='share-button'><?php p($l->t('Share'));?></button>
+					-->
 					<button id='cancel-button'><?php p($l->t('Cancel')); ?></button>
 					<button id='save-button'><?php p($l->t('Save')); ?></button>
 				</div>
 				<div style="clear: both;"></div>
+				<!--
 				<div id="note-share-options">
 					<ul id="share-pos">
 					</ul>
@@ -17,6 +20,7 @@
 					<ul id="share-neg">
 					</ul>
 				</div>
+				-->
 				<div class="note-toolbar">
 					<a href="#" class="circle-toolbar" style="background-color: #F7EB96"></a>
 					<a href="#" class="circle-toolbar" style="background-color: #88B7E3"></a>