diff --git a/chrome_point_plus/css/point-plus.css b/chrome_point_plus/css/point-plus.css
index e71bd12..177851a 100644
--- a/chrome_point_plus/css/point-plus.css
+++ b/chrome_point_plus/css/point-plus.css
@@ -173,7 +173,7 @@ div#markItUpText-input {
 }
 
 /* Labels in post */
-.post .post-id a .cn.changed_background{
+.post .post-id a .cn.changed_background {
 }
 
 .post .post-id a .authors_unique_count, .post .post-id a .recommendation_count {
@@ -191,46 +191,46 @@ div#markItUpText-input {
 /* NSFW-content */
 .post-tag-nsfw.blur-nsfw-images a.postimg img,
 .post-tag-сиськи.blur-nsfw-images a.postimg img,
-#comments.blur-nsfw-images a.postimg img{
+#comments.blur-nsfw-images a.postimg img {
     margin-top: 5px;
     -webkit-filter: blur(30px);
 }
 
 .post-tag-nsfw.blur-nsfw-images a.postimg:hover img,
 .post-tag-сиськи.blur-nsfw-images a.postimg:hover img,
-#comments.blur-nsfw-images a.postimg:hover img{
+#comments.blur-nsfw-images a.postimg:hover img {
     -webkit-filter: none;
 }
 
 .post-tag-nsfw.hide-nsfw-posts,
-.post-tag-сиськи.hide-nsfw-posts{
+.post-tag-сиськи.hide-nsfw-posts {
     display: none;
 }
 
 .post-tag-nsfw.blur-nsfw-entire .post-content .text,
 .post-tag-сиськи.blur-nsfw-entire .post-content .text,
-#comments.blur-nsfw-entire .post-content .text{
+#comments.blur-nsfw-entire .post-content .text {
     -webkit-filter: blur(30px);
 }
 
 .post-tag-nsfw.hide-nsfw-posts,
-.post-tag-сиськи.hide-nsfw-posts{
+.post-tag-сиськи.hide-nsfw-posts {
     display: none;
 }
 
 /* Черновики */
-#new-post-form #text-input{
+#new-post-form #text-input {
     height: 30em !important;
 }
 
-#new-post-form .draft_save_status{
+#new-post-form #draft-save-status {
     display: none;
     padding: 3px 5px;
     color: green;
 }
 
 /* point-plus-debug */
-#point-plus-debug{
+#point-plus-debug {
     float: right;
     display: block;
     color: rgba(255,255,255,.75);
diff --git a/chrome_point_plus/js/point-plus.js b/chrome_point_plus/js/point-plus.js
index 00897cf..9b103b2 100644
--- a/chrome_point_plus/js/point-plus.js
+++ b/chrome_point_plus/js/point-plus.js
@@ -66,6 +66,7 @@ $(document).ready(function() {
                 $('.post .post-content a[href*="\\:\\/\\/soundcloud\\.com\\/"]').each(function(index) {
                     console.log($(this));
 
+                    // @todo: вынести в отдельный шаблон
                     $player = $('<div class="pp-soundcloud">\
                                     <object height="81" width="100%" id="pp-soundcloud-' + index + '" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000">\
                                       <param name="movie" value="//player.soundcloud.com/player.swf?url=' + encodeURIComponent($(this).prop('href'))
@@ -979,17 +980,17 @@ function space_key_event() {
 }
 
 /* Автосохранение черновиков */
-var draft_last_text = '';// Последний зафиксированный текст
+var draft_last_text = ''; // Последний зафиксированный текст
 function draft_restore() {
-    chrome.storage.sync.get('point_draft_text', function(items) {
+    chrome.storage.local.get('point_draft_text', function(items) {
         $('#new-post-form #text-input').val(items.point_draft_text);
-        draft_last_text=items.point_draft_text;
+        draft_last_text = items.point_draft_text;
     });
 }
 
 function draft_set_save_handler() {
     setInterval(draft_save_check, 5000);
-    $('#new-post-wrap .footnote').html($('#new-post-wrap .footnote').html() + '<div class="draft_save_status"></div>');
+    $('#new-post-wrap .footnote').append($('<div id="draft-save-status">'));
 }
 
 var draft_save_busy = false;
@@ -999,24 +1000,23 @@ function draft_save_check() {
     }
     draft_save_busy = true;
 
-    // Видишь поиск id внутри id?.. ненавидишь меня?
     var current_text = $('#new-post-form #text-input').val();
     if (draft_last_text == current_text) {
         draft_save_busy = false;
         return;
     }
     // @todo i18n
-    $('.draft_save_status').text('Сохраняем черновик...').show();
+    $('#draft-save-status').text('Сохраняем черновик...').show();
 
     // Сохраняем
-    draft_last_text=current_text;
+    draft_last_text = current_text;
     // Save it using the Chrome extension storage API.
-    chrome.storage.sync.set({'point_draft_text': draft_last_text}, function() {
+    chrome.storage.local.set({'point_draft_text': draft_last_text}, function() {
         // Notify that we saved.
-        draft_save_busy=false;
-        $('.draft_save_status').text('Черновик сохранён...');
-        setTimeout(function(){
-            $('.draft_save_status').fadeOut(500);
+        draft_save_busy = false;
+        $('#draft-save-status').text('Черновик сохранён...');
+        setTimeout(function() {
+            $('#draft-save-status').fadeOut(1000);
         }, 1000);
     });
 }