diff --git a/css/style.css b/css/style.css
index dbd06f5..75e7523 100644
--- a/css/style.css
+++ b/css/style.css
@@ -5,7 +5,7 @@
 .quicknote {
     min-height: 150px;
     width: 250px;
-    padding: 6px;
+    padding: 10px;
     border-radius: 3px;
     box-shadow: 0 4px 6px #c1c1c1;
 }
@@ -20,6 +20,10 @@
   /*width: 100%;*/
 }
 
+.note-active #content-editable {
+    margin-bottom: 60px;
+}
+
 .icon-delete-note {
     float: right;
     position: absolute;
@@ -29,6 +33,8 @@
 
 #div-content .save-button {
     float: right;
+    padding-right: 8px;
+    padding-bottom: 5px;
 }
 
 #div-content textarea {
@@ -62,6 +68,7 @@
 
 .note-toolbar {
    float:left;
+   padding-bottom: 3px;
 }
 
 .circle-toolbar {
@@ -116,7 +123,8 @@
 }
 
 #content-editable {
-    min-height: 20px;
+    min-height: 50px;
+    word-wrap: break-word;
 }
 
 .note-options {
diff --git a/templates/part.note-modal-editable.php b/templates/part.note-modal-editable.php
index effda97..6c53453 100644
--- a/templates/part.note-modal-editable.php
+++ b/templates/part.note-modal-editable.php
@@ -4,11 +4,9 @@
 			<div contenteditable="true" id='title-editable' class='note-title'></div>
 			<div contenteditable="true" id='content-editable' class='note-content' data-placeholder="No content"></div>
 			<div class="note-options">
-				<div class="save-button">
-					<button id='save-button'><?php p($l->t('Save')); ?></button>
-				</div>
 				<div class="save-button">
 					<button id='cancel-button'><?php p($l->t('Cancel')); ?></button>
+					<button id='save-button'><?php p($l->t('Save')); ?></button>
 				</div>
 				<div class="note-toolbar">
 					<a href="#" class="circle-toolbar" style="background-color: #F7EB96"></a>