diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b664bb..edad2aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### v2.0.1
+- Remove ToC button in edit mode
+- Fix for creating new notes
+  
 ### v2.0.0
 - Added loader animation
 - Added option to remove media
diff --git a/composer.json b/composer.json
index bd42fec..dab3b87 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
 	"homepage": "https://github.com/Offerel/roundcube_primitivenotes",
 	"type": "roundcube-plugin",
 	"license": "AGPL-3.0",
-	"version": "2.0.0",
+	"version": "2.0.1",
 	"authors": [
 	{
 		"name": "Offerel",
diff --git a/js/notes.js b/js/notes.js
index b804cdf..1c383fa 100644
--- a/js/notes.js
+++ b/js/notes.js
@@ -1,7 +1,7 @@
 /**
  * Roundcube Notes Plugin
  *
- * @version 2.0.0
+ * @version 2.0.1
  * @author Offerel
  * @copyright Copyright (c) 2021, Offerel
  * @license GNU General Public License, version 3
@@ -83,9 +83,32 @@ $(document).ready(function(){
             if(estate.value == 's') {
                 mde.togglePreview();
 				estate.value = 'e';
-                document.querySelector('#main_area .editor-toolbar').style.display = 'block';
             }
-            mde.value("");
+			mde.value("");
+			document.getElementById('fname').value = '';
+			let editor1 = document.getElementById('editor1');
+			editor1.value = '';
+
+			if(e.data.format == 'md') {
+				document.querySelector('#main_area .editor-toolbar').style.display = 'block';
+				document.querySelector('.EasyMDEContainer').style = 'display: block';
+				mde.value('');
+			} else {
+				let toolbar = document.createElement('div');
+				toolbar.id = 'atoolbar';
+				let bSave = document.createElement('li');
+				bSave.id = 'bSave';
+				bSave.classList.add("fa", "fa-floppy-o");
+				bSave.addEventListener('click', sbfile, false);
+				toolbar.appendChild(bSave);
+				let bSeperator = document.createElement('i');
+				bSeperator.classList.add("separator");
+				toolbar.appendChild(bSeperator);
+
+				editor1.parentNode.insertBefore(toolbar, editor1);
+				document.querySelector('.EasyMDEContainer').style = 'display: none';
+				editor1.style = 'display: block';
+			}
 		}
 		if('editor' in e.data && e.data.editor == 'edit') {
             if(estate.value == 's') {
@@ -107,13 +130,11 @@ $(document).ready(function(){
 					let toolbar = document.createElement('div');
 					let editor = document.getElementById('editor1');
 					toolbar.id = 'atoolbar';
-
 					let bSave = document.createElement('li');
 					bSave.id = 'bSave';
 					bSave.classList.add("fa", "fa-floppy-o");
 					bSave.addEventListener('click', sbfile, false);
 					toolbar.appendChild(bSave);
-
 					let bSeperator = document.createElement('i');
 					bSeperator.classList.add("separator");
 					toolbar.appendChild(bSeperator);
diff --git a/js/notes.min.js b/js/notes.min.js
index cef5333..496afc8 100644
--- a/js/notes.min.js
+++ b/js/notes.min.js
@@ -1,9 +1,9 @@
 /**
  * Roundcube Notes Plugin
  *
- * @version 2.0.0
+ * @version 2.0.1
  * @author Offerel
  * @copyright Copyright (c) 2021, Offerel
  * @license GNU General Public License, version 3
  */
-$(document).ready((function(){var tagify=new Tagify(document.querySelector("#ntags"),{whitelist:[],dropdown:{classname:"color-blue",enabled:0,maxItems:0,position:"text",closeOnSelect:!1,highlightFirst:!0},trim:!0,duplicates:!1,enforceWhitelist:!1,delimiters:",|;| ",placeholder:"Tags"});$.ajax({type:"POST",url:"notes.php",data:{action:"getTags"},success:function(data){tagify.settings.whitelist=JSON.parse(data)}});var mde=new EasyMDE({element:document.getElementById("editor1"),autoDownloadFontAwesome:!1,autofocus:!0,spellChecker:!1,autofocus:!0,status:!1,promptURLs:!0,renderingConfig:{codeSyntaxHighlighting:!0},toolbar:[{name:"Save",action:saveFile,className:"fa fa-floppy-o",title:"Save"},"|","undo","redo","|","bold","italic","strikethrough","clean-block","|","heading","heading-smaller","heading-bigger","|","code","quote","unordered-list","ordered-list","|","link",{name:"Image",action:uplInsertImage,className:"fa fa-picture-o",title:"Add image from URL"},{name:"Image",action:uplLocalImage,className:"fa fa-file-image-o",title:"Upload and insert local image"},"table","|","preview","side-by-side","fullscreen","guide","|"]});function firstNote(){showNote(document.getElementById("filelist").firstElementChild.classList[0])}function sbfile(){let tags=tagify.value,tArr=[];for(let tag in tags)tArr.push(tags[tag].value);$.ajax({type:"POST",url:"notes.php",data:{action:"sbfile",name:document.getElementById("note_name").value,fname:document.getElementById("fname").value,tags:tArr,content:document.getElementById("editor1").value},success:function(response){""==response?(console.log("Note saved successfully"),location.reload()):alert(response)}})}function showNote(id){document.querySelector("#main_area .editor-toolbar").style.display="none",document.getElementById("atoolbar")&&document.getElementById("atoolbar").remove(),document.getElementById("tbutton")&&document.getElementById("tbutton").remove();let loader=document.createElement("div");loader.classList.add("db-spinner"),loader.id="db-spinner",document.getElementById("main").appendChild(loader),document.getElementById("save_button").style.display="none";for(var elements=document.getElementsByClassName("selected");elements.length>0;)elements[0].classList.remove("selected");document.getElementById(id).classList.add("selected"),window.parent.document.getElementById("editnote").classList.remove("disabled"),window.parent.document.getElementById("deletenote").classList.remove("disabled"),window.parent.document.getElementById("sendnote").classList.remove("disabled");var fname=document.getElementById("entry"+id).value;$.ajax({type:"POST",url:"notes.php",data:{action:"showNote",filename:fname,id:id},success:function(data){var note=JSON.parse(data);document.getElementById("bcontent")&&document.getElementById("bcontent").remove(),document.querySelector(".EasyMDEContainer").classList.remove("EasyMDEContainerH"),document.getElementById("tocdiv")&&document.getElementById("tocdiv").remove();let headerTitle=document.createElement("span");if(headerTitle.id="headerTitle",headerTitle.classList.add("headerTitle"),document.querySelector("#main_header #note_name")&&document.querySelector("#main_header #note_name").replaceWith(headerTitle),document.querySelector("tags").classList.remove("edit"),document.getElementById("headerTitle").innerText=note.notename,document.getElementById("fname").value=note.filename,tagify.setReadonly(!0),tagify.removeAllTags(),tagify.addTags(note.tags),document.querySelector(".EasyMDEContainer").style="display: block;",document.getElementById("editor1").style="display none;",mde.value(note.content),document.getElementById("editor1").value=note.content,"text"==note.mime_type.substr(0,4)){"e"==document.getElementById("estate").value&&(document.getElementById("estate").value="s",mde.togglePreview());var headings=document.querySelectorAll("h1, h2, h3, h4, h5, h6");if(headings.length>0){let tbutton=document.createElement("button");tbutton.id="tbutton",tbutton.innerText="ToC",document.getElementById("main_header").appendChild(tbutton);let tocdiv=document.createElement("div");tocdiv.id="tocdiv";let o=0,a=0,list="c%";headings.forEach((function(element){a=element.tagName.substr(1,1),list=o<a?list.replace("c%",'<li><ul><li><a title="'+element.innerText+'" href="#'+element.id+'">'+element.innerText+"</a></li>c%</ul></li>"):o>a?list.replace("c%",'</ul><li><a title="'+element.innerText+'" href="#'+element.id+'">'+element.innerText+"</a></li>c%"):list.replace("c%",'<li><a title="'+element.innerText+'" href="#'+element.id+'">'+element.innerText+"</a></li>c%"),o=a})),list=list.replace("c%</ul>",""),tocdiv.innerHTML=list,tbutton.addEventListener("click",(function(e){e.preventDefault(),tocdiv.classList.toggle("tdhidden")})),document.querySelector(".EasyMDEContainer").appendChild(tocdiv),document.querySelectorAll("#tocdiv a").forEach((function(elem){elem.addEventListener("click",(function(){tocdiv.classList.toggle("tdhidden")}))}))}}else{let bcontent=document.createElement("object");bcontent.data="data:"+note.mime_type+";base64,"+note.content,bcontent.type=note.mime_type,bcontent.id="bcontent",note.mime_type.includes("pdf")&&(bcontent.style="width: 100%; height: 100%;"),document.querySelector(".EasyMDEContainer").classList.add("EasyMDEContainerH"),document.getElementById("main_area").appendChild(bcontent),document.getElementById("editor1").style="display: none",document.getElementById("atoolbar")&&document.getElementById("atoolbar").remove()}document.getElementById("db-spinner").parentNode.removeChild(loader)}})}function simage(){for(var allowed_extensions=new Array("jpg","jpeg","png"),file_extension=document.getElementById("localimg").value.split(".").pop().toLowerCase(),i=0;i<=allowed_extensions.length;i++)if(allowed_extensions[i]==file_extension){var file_data=$("#localimg").prop("files")[0],formData=new FormData;return formData.append("localFile",file_data),$.ajax({type:"POST",url:"notes.php",dataType:"text",cache:!1,contentType:!1,processData:!1,data:formData,success:function(data){pos=mde.codemirror.getCursor(),mde.codemirror.setSelection(pos,pos),mde.codemirror.replaceSelection("![]("+data+")")}}),!0}return alert("Unsupported file format"),!1}function saveFile(editor){let loader=document.createElement("div");loader.classList.add("db-spinner"),loader.id="db-spinner",document.getElementById("main").appendChild(loader);let fname=document.getElementById("fname").value,extb=fname.lastIndexOf(".")+1,tags=tagify.value,tArr=[];for(let tag in tags)tArr.push(tags[tag].value);$.ajax({type:"POST",url:"notes.php",data:{action:"editNote",note_name:document.getElementById("note_name").value,fname:fname,ntags:tArr,editor1:mde.value(),ftype:fname.substr(extb)},success:function(response){""==response?(console.log("Note saved successfully"),location.reload()):alert(response),loader.remove()}})}function uplLocalImage(){document.getElementById("localimg").click()}function uplInsertImage(){var imageURL=prompt("URL of the image","");if(!imageURL)return!1;$.ajax({type:"POST",url:"notes.php",data:{action:"uplImage",imageURL:imageURL},success:function(data){pos=mde.codemirror.getCursor(),mde.codemirror.setSelection(pos,pos),mde.codemirror.replaceSelection("![]("+data+")")}})}function searchList(){var input,filter,ul,li,a,i;for(filter=(input=document.getElementById("notesearch")).value.toUpperCase(),li=(ul=document.getElementById("filelist")).getElementsByTagName("li"),i=0;i<li.length;i++)(a=li[i].getElementsByTagName("a")[0]).innerHTML.toUpperCase().indexOf(filter)>-1?li[i].style.display="":li[i].style.display="none"}document.querySelectorAll("#filelist li a").forEach((function(note){note.addEventListener("click",(function(){showNote(note.parentElement.id),tagify.setReadonly(!0)}))})),window.addEventListener("message",e=>{let estate=document.getElementById("estate");if("tstate"in e.data&&tagify.setReadonly(e.data.tstate),"ttags"in e.data&&""==e.data.ttags&&tagify.removeAllTags(),"editor"in e.data&&"new"==e.data.editor&&("s"==estate.value&&(mde.togglePreview(),estate.value="e",document.querySelector("#main_area .editor-toolbar").style.display="block"),mde.value("")),"editor"in e.data&&"edit"==e.data.editor){"s"==estate.value&&(mde.togglePreview(),estate.value="e");let file=document.getElementById("fname").value.split("."),format=file[file.length-1];switch(document.getElementById("atoolbar")&&document.getElementById("atoolbar").remove(),format){case"md":document.querySelector(".EasyMDEContainer").style="display: block;",document.querySelector("#main_area .editor-toolbar").style.display="block",document.querySelector("#editor1").style="display: none;";break;default:let toolbar=document.createElement("div"),editor=document.getElementById("editor1");toolbar.id="atoolbar";let bSave=document.createElement("li");bSave.id="bSave",bSave.classList.add("fa","fa-floppy-o"),bSave.addEventListener("click",sbfile,!1),toolbar.appendChild(bSave);let bSeperator=document.createElement("i");bSeperator.classList.add("separator"),toolbar.appendChild(bSeperator),editor.parentNode.insertBefore(toolbar,editor),document.querySelector(".EasyMDEContainer").style="display: none",editor.style="display: block",document.getElementById("bcontent")&&(document.getElementById("editor1").style="display: none")}}}),document.addEventListener("keyup",event=>{if("Escape"==event.key&&"e"==document.getElementById("estate").value){mde.togglePreview(),document.querySelector("#main_area .editor-toolbar").style.display="none",document.getElementById("estate").value="s";let headerTitle=document.createElement("span");headerTitle.id="headerTitle",headerTitle.classList.add("headerTitle"),headerTitle.innerText=document.getElementById("note_name").value,document.querySelector("#main_header #note_name").replaceWith(headerTitle),document.querySelector("tags").classList.remove("edit"),tagify.setReadonly(!0)}}),document.getElementById("notesearch").addEventListener("keyup",searchList,!1),document.getElementById("save_button").addEventListener("click",(function(){document.getElementById("metah").submit()})),document.getElementById("localimg").addEventListener("change",simage,!1),new rcube_splitter({id:"notessplitter",p1:"#sidebar",p2:"#main",orientation:"v",relative:!0,start:400,min:250,size:12}).init(),firstNote()}));
\ No newline at end of file
+$(document).ready((function(){var tagify=new Tagify(document.querySelector("#ntags"),{whitelist:[],dropdown:{classname:"color-blue",enabled:0,maxItems:0,position:"text",closeOnSelect:!1,highlightFirst:!0},trim:!0,duplicates:!1,enforceWhitelist:!1,delimiters:",|;| ",placeholder:"Tags"});$.ajax({type:"POST",url:"notes.php",data:{action:"getTags"},success:function(data){tagify.settings.whitelist=JSON.parse(data)}});var mde=new EasyMDE({element:document.getElementById("editor1"),autoDownloadFontAwesome:!1,autofocus:!0,spellChecker:!1,autofocus:!0,status:!1,promptURLs:!0,renderingConfig:{codeSyntaxHighlighting:!0},toolbar:[{name:"Save",action:saveFile,className:"fa fa-floppy-o",title:"Save"},"|","undo","redo","|","bold","italic","strikethrough","clean-block","|","heading","heading-smaller","heading-bigger","|","code","quote","unordered-list","ordered-list","|","link",{name:"Image",action:uplInsertImage,className:"fa fa-picture-o",title:"Add image from URL"},{name:"Image",action:uplLocalImage,className:"fa fa-file-image-o",title:"Upload and insert local image"},"table","|","preview","side-by-side","fullscreen","guide","|"]});function firstNote(){showNote(document.getElementById("filelist").firstElementChild.classList[0])}function sbfile(){let tags=tagify.value,tArr=[];for(let tag in tags)tArr.push(tags[tag].value);$.ajax({type:"POST",url:"notes.php",data:{action:"sbfile",name:document.getElementById("note_name").value,fname:document.getElementById("fname").value,tags:tArr,content:document.getElementById("editor1").value},success:function(response){""==response?(console.log("Note saved successfully"),location.reload()):alert(response)}})}function showNote(id){document.querySelector("#main_area .editor-toolbar").style.display="none",document.getElementById("atoolbar")&&document.getElementById("atoolbar").remove(),document.getElementById("tbutton")&&document.getElementById("tbutton").remove();let loader=document.createElement("div");loader.classList.add("db-spinner"),loader.id="db-spinner",document.getElementById("main").appendChild(loader),document.getElementById("save_button").style.display="none";for(var elements=document.getElementsByClassName("selected");elements.length>0;)elements[0].classList.remove("selected");document.getElementById(id).classList.add("selected"),window.parent.document.getElementById("editnote").classList.remove("disabled"),window.parent.document.getElementById("deletenote").classList.remove("disabled"),window.parent.document.getElementById("sendnote").classList.remove("disabled");var fname=document.getElementById("entry"+id).value;$.ajax({type:"POST",url:"notes.php",data:{action:"showNote",filename:fname,id:id},success:function(data){var note=JSON.parse(data);document.getElementById("bcontent")&&document.getElementById("bcontent").remove(),document.querySelector(".EasyMDEContainer").classList.remove("EasyMDEContainerH"),document.getElementById("tocdiv")&&document.getElementById("tocdiv").remove();let headerTitle=document.createElement("span");if(headerTitle.id="headerTitle",headerTitle.classList.add("headerTitle"),document.querySelector("#main_header #note_name")&&document.querySelector("#main_header #note_name").replaceWith(headerTitle),document.querySelector("tags").classList.remove("edit"),document.getElementById("headerTitle").innerText=note.notename,document.getElementById("fname").value=note.filename,tagify.setReadonly(!0),tagify.removeAllTags(),tagify.addTags(note.tags),document.querySelector(".EasyMDEContainer").style="display: block;",document.getElementById("editor1").style="display none;",mde.value(note.content),document.getElementById("editor1").value=note.content,"text"==note.mime_type.substr(0,4)){"e"==document.getElementById("estate").value&&(document.getElementById("estate").value="s",mde.togglePreview());var headings=document.querySelectorAll("h1, h2, h3, h4, h5, h6");if(headings.length>0){let tbutton=document.createElement("button");tbutton.id="tbutton",tbutton.innerText="ToC",document.getElementById("main_header").appendChild(tbutton);let tocdiv=document.createElement("div");tocdiv.id="tocdiv";let o=0,a=0,list="c%";headings.forEach((function(element){a=element.tagName.substr(1,1),list=o<a?list.replace("c%",'<li><ul><li><a title="'+element.innerText+'" href="#'+element.id+'">'+element.innerText+"</a></li>c%</ul></li>"):o>a?list.replace("c%",'</ul><li><a title="'+element.innerText+'" href="#'+element.id+'">'+element.innerText+"</a></li>c%"):list.replace("c%",'<li><a title="'+element.innerText+'" href="#'+element.id+'">'+element.innerText+"</a></li>c%"),o=a})),list=list.replace("c%</ul>",""),tocdiv.innerHTML=list,tbutton.addEventListener("click",(function(e){e.preventDefault(),tocdiv.classList.toggle("tdhidden")})),document.querySelector(".EasyMDEContainer").appendChild(tocdiv),document.querySelectorAll("#tocdiv a").forEach((function(elem){elem.addEventListener("click",(function(){tocdiv.classList.toggle("tdhidden")}))}))}}else{let bcontent=document.createElement("object");bcontent.data="data:"+note.mime_type+";base64,"+note.content,bcontent.type=note.mime_type,bcontent.id="bcontent",note.mime_type.includes("pdf")&&(bcontent.style="width: 100%; height: 100%;"),document.querySelector(".EasyMDEContainer").classList.add("EasyMDEContainerH"),document.getElementById("main_area").appendChild(bcontent),document.getElementById("editor1").style="display: none",document.getElementById("atoolbar")&&document.getElementById("atoolbar").remove()}document.getElementById("db-spinner").parentNode.removeChild(loader)}})}function simage(){for(var allowed_extensions=new Array("jpg","jpeg","png"),file_extension=document.getElementById("localimg").value.split(".").pop().toLowerCase(),i=0;i<=allowed_extensions.length;i++)if(allowed_extensions[i]==file_extension){var file_data=$("#localimg").prop("files")[0],formData=new FormData;return formData.append("localFile",file_data),$.ajax({type:"POST",url:"notes.php",dataType:"text",cache:!1,contentType:!1,processData:!1,data:formData,success:function(data){pos=mde.codemirror.getCursor(),mde.codemirror.setSelection(pos,pos),mde.codemirror.replaceSelection("![]("+data+")")}}),!0}return alert("Unsupported file format"),!1}function saveFile(editor){let loader=document.createElement("div");loader.classList.add("db-spinner"),loader.id="db-spinner",document.getElementById("main").appendChild(loader);let fname=document.getElementById("fname").value,extb=fname.lastIndexOf(".")+1,tags=tagify.value,tArr=[];for(let tag in tags)tArr.push(tags[tag].value);$.ajax({type:"POST",url:"notes.php",data:{action:"editNote",note_name:document.getElementById("note_name").value,fname:fname,ntags:tArr,editor1:mde.value(),ftype:fname.substr(extb)},success:function(response){""==response?(console.log("Note saved successfully"),location.reload()):alert(response),loader.remove()}})}function uplLocalImage(){document.getElementById("localimg").click()}function uplInsertImage(){var imageURL=prompt("URL of the image","");if(!imageURL)return!1;$.ajax({type:"POST",url:"notes.php",data:{action:"uplImage",imageURL:imageURL},success:function(data){pos=mde.codemirror.getCursor(),mde.codemirror.setSelection(pos,pos),mde.codemirror.replaceSelection("![]("+data+")")}})}function searchList(){var input,filter,ul,li,a,i;for(filter=(input=document.getElementById("notesearch")).value.toUpperCase(),li=(ul=document.getElementById("filelist")).getElementsByTagName("li"),i=0;i<li.length;i++)(a=li[i].getElementsByTagName("a")[0]).innerHTML.toUpperCase().indexOf(filter)>-1?li[i].style.display="":li[i].style.display="none"}document.querySelectorAll("#filelist li a").forEach((function(note){note.addEventListener("click",(function(){showNote(note.parentElement.id),tagify.setReadonly(!0)}))})),window.addEventListener("message",e=>{let estate=document.getElementById("estate");if("tstate"in e.data&&tagify.setReadonly(e.data.tstate),"ttags"in e.data&&""==e.data.ttags&&tagify.removeAllTags(),"editor"in e.data&&"new"==e.data.editor){"s"==estate.value&&(mde.togglePreview(),estate.value="e"),mde.value(""),document.getElementById("fname").value="";let editor1=document.getElementById("editor1");if(editor1.value="","md"==e.data.format)document.querySelector("#main_area .editor-toolbar").style.display="block",document.querySelector(".EasyMDEContainer").style="display: block",mde.value("");else{let toolbar=document.createElement("div");toolbar.id="atoolbar";let bSave=document.createElement("li");bSave.id="bSave",bSave.classList.add("fa","fa-floppy-o"),bSave.addEventListener("click",sbfile,!1),toolbar.appendChild(bSave);let bSeperator=document.createElement("i");bSeperator.classList.add("separator"),toolbar.appendChild(bSeperator),editor1.parentNode.insertBefore(toolbar,editor1),document.querySelector(".EasyMDEContainer").style="display: none",editor1.style="display: block"}}if("editor"in e.data&&"edit"==e.data.editor){"s"==estate.value&&(mde.togglePreview(),estate.value="e");let file=document.getElementById("fname").value.split("."),format=file[file.length-1];switch(document.getElementById("atoolbar")&&document.getElementById("atoolbar").remove(),format){case"md":document.querySelector(".EasyMDEContainer").style="display: block;",document.querySelector("#main_area .editor-toolbar").style.display="block",document.querySelector("#editor1").style="display: none;";break;default:let toolbar=document.createElement("div"),editor=document.getElementById("editor1");toolbar.id="atoolbar";let bSave=document.createElement("li");bSave.id="bSave",bSave.classList.add("fa","fa-floppy-o"),bSave.addEventListener("click",sbfile,!1),toolbar.appendChild(bSave);let bSeperator=document.createElement("i");bSeperator.classList.add("separator"),toolbar.appendChild(bSeperator),editor.parentNode.insertBefore(toolbar,editor),document.querySelector(".EasyMDEContainer").style="display: none",editor.style="display: block",document.getElementById("bcontent")&&(document.getElementById("editor1").style="display: none")}}}),document.addEventListener("keyup",event=>{if("Escape"==event.key&&"e"==document.getElementById("estate").value){mde.togglePreview(),document.querySelector("#main_area .editor-toolbar").style.display="none",document.getElementById("estate").value="s";let headerTitle=document.createElement("span");headerTitle.id="headerTitle",headerTitle.classList.add("headerTitle"),headerTitle.innerText=document.getElementById("note_name").value,document.querySelector("#main_header #note_name").replaceWith(headerTitle),document.querySelector("tags").classList.remove("edit"),tagify.setReadonly(!0)}}),document.getElementById("notesearch").addEventListener("keyup",searchList,!1),document.getElementById("save_button").addEventListener("click",(function(){document.getElementById("metah").submit()})),document.getElementById("localimg").addEventListener("change",simage,!1),new rcube_splitter({id:"notessplitter",p1:"#sidebar",p2:"#main",orientation:"v",relative:!0,start:400,min:250,size:12}).init(),firstNote()}));
\ No newline at end of file
diff --git a/js/primitivenotes.js b/js/primitivenotes.js
index fadf27c..99bd0b5 100644
--- a/js/primitivenotes.js
+++ b/js/primitivenotes.js
@@ -1,7 +1,7 @@
 /**
  * Roundcube Notes Plugin
  *
- * @version 2.0.0
+ * @version 2.0.1
  * @author Offerel
  * @copyright Copyright (c) 2021, Offerel
  * @license GNU General Public License, version 3
@@ -13,7 +13,8 @@ window.rcmail && rcmail.addEventListener("init", function(a) {
     rcmail.register_command("sendnote", send_note, !0);
     rcmail.register_command("addnote", add_note, !0);
     rcmail.register_command("mdnote", new_note, !0);
-    rcmail.register_command("txtnote", new_note, !0);
+	  rcmail.register_command("txtnote", new_note, !0);
+	document.getElementById('upl').addEventListener('change', sform, false );
 });
 
 function add_note() {
@@ -32,18 +33,24 @@ function new_note(a) {
 	$("#notescontentframe").contents().find("#headerTitle").replaceWith(nname);
 	$("#notescontentframe").contents().find("#note_name").replaceWith(nname);
 	$("#notescontentframe").contents().find("tags").addClass('edit');
+	$("#notescontentframe").contents().find("#tbutton").remove();
    
     let tstate = {
         tstate:false,
         ttags:'',
-        editor:'new',
+		    editor:'new',
+		    format:format,
     };
     document.getElementById('notescontentframe').contentWindow.postMessage(tstate, location.href);
-    $("#notescontentframe").contents().find("#note_name")[0].placeholder = rcmail.gettext("note_title", "primitivenotes");
+	$("#notescontentframe").contents().find("#note_name")[0].placeholder = rcmail.gettext("note_title", "primitivenotes");
+	document.getElementById('editnote').classList.add('disabled');
+	document.getElementById('deletenote').classList.add('disabled');
+	document.getElementById('sendnote').classList.add('disabled');
 }
 
 function edit_note() {
 	let nTitel = $("#notescontentframe").contents().find("#headerTitle");
+	$("#notescontentframe").contents().find("#tbutton").remove();
 	let nname = document.createElement('input');
 	nname.id = 'note_name';
 	nname.name = nname.id;
@@ -102,4 +109,18 @@ function send_note() {
         _note_type: b,
         _note_filename: a
     }, !0) : alert(rcmail.gettext("note_inv_format", "primitivenotes"))
-};
\ No newline at end of file
+};
+
+function sform() {
+	fileName = this.value;
+	var allowed_extensions = new Array('html', 'pdf', 'jpg', 'png', 'md', 'txt');
+	var file_extension = fileName.split('.').pop().toLowerCase(); 
+	for(var i = 0; i <= allowed_extensions.length; i++) {
+		if(allowed_extensions[i]==file_extension) {
+			document.getElementById("upl_form").submit();
+			return true;
+		}
+	}
+	alert('<roundcube:label name=\"primitivenotes.note_inv_format\" />');
+	return false;
+}
\ No newline at end of file
diff --git a/js/primitivenotes.min.js b/js/primitivenotes.min.js
index e6dad6a..238e374 100644
--- a/js/primitivenotes.min.js
+++ b/js/primitivenotes.min.js
@@ -1,9 +1,9 @@
 /**
  * Roundcube Notes Plugin
  *
- * @version 2.0.0
+ * @version 2.0.1
  * @author Offerel
  * @copyright Copyright (c) 2021, Offerel
  * @license GNU General Public License, version 3
  */
-function add_note(){document.getElementById("upl").click()}function new_note(a){format=a||rcmail.env.dformat;let nname=document.createElement("input");nname.id="note_name",nname.name=nname.id,nname.type="text",nname.style="font-size: 2em",nname.required=!0,nname.value="",$("#notescontentframe").contents().find("#headerTitle").replaceWith(nname),$("#notescontentframe").contents().find("#note_name").replaceWith(nname),$("#notescontentframe").contents().find("tags").addClass("edit");let tstate={tstate:!1,ttags:"",editor:"new"};document.getElementById("notescontentframe").contentWindow.postMessage(tstate,location.href),$("#notescontentframe").contents().find("#note_name")[0].placeholder=rcmail.gettext("note_title","primitivenotes")}function edit_note(){let nTitel=$("#notescontentframe").contents().find("#headerTitle"),nname=document.createElement("input");nname.id="note_name",nname.name=nname.id,nname.type="text",nname.style="font-size: 2em",nname.required=!0,nname.value=nTitel[0].innerText,nTitel.replaceWith(nname);let tstate={tstate:!1,editor:"edit"};document.getElementById("notescontentframe").contentWindow.postMessage(tstate,location.href),$("#notescontentframe").contents().find("tags").addClass("edit")}function delete_note(){var a=window.frames.notescontentframe.document.getElementById("fname").value,b=window.frames.notescontentframe.document.getElementById("headerTitle").innerText,c=rcmail.gettext("note_del_note","primitivenotes").replace("%note%",b);if(a&&b){if(!confirm(c))return!1;$.ajax({url:"plugins/primitivenotes/notes.php",type:"post",data:{action:"delNote",mode:"delete",fileid:a},success:function(a){if(""!=a){var result=JSON.parse(a);""!=result.data&&confirm(result.message)&&$.ajax({url:"plugins/primitivenotes/notes.php",type:"post",data:{action:"delMedia",files:JSON.stringify(result.data)}})}document.getElementById("notescontentframe").src="plugins/primitivenotes/notes.php"}})}}function send_note(){var a=window.frames.notescontentframe.document.getElementById("fname").value,b=a.substring(a.lastIndexOf(".")+1);-1<"html pdf jpg png md txt".split(" ").indexOf(b)?rcmail.goto_url("mail/compose",{_note_type:b,_note_filename:a},!0):alert(rcmail.gettext("note_inv_format","primitivenotes"))}window.rcmail&&rcmail.addEventListener("init",(function(a){rcmail.register_command("newnote",new_note,!0),rcmail.register_command("editnote",edit_note,!0),rcmail.register_command("deletenote",delete_note,!0),rcmail.register_command("sendnote",send_note,!0),rcmail.register_command("addnote",add_note,!0),rcmail.register_command("mdnote",new_note,!0),rcmail.register_command("txtnote",new_note,!0)}));
\ No newline at end of file
+function add_note(){document.getElementById("upl").click()}function new_note(a){format=a||rcmail.env.dformat;let nname=document.createElement("input");nname.id="note_name",nname.name=nname.id,nname.type="text",nname.style="font-size: 2em",nname.required=!0,nname.value="",$("#notescontentframe").contents().find("#headerTitle").replaceWith(nname),$("#notescontentframe").contents().find("#note_name").replaceWith(nname),$("#notescontentframe").contents().find("tags").addClass("edit"),$("#notescontentframe").contents().find("#tbutton").remove();let tstate={tstate:!1,ttags:"",editor:"new",format:format};document.getElementById("notescontentframe").contentWindow.postMessage(tstate,location.href),$("#notescontentframe").contents().find("#note_name")[0].placeholder=rcmail.gettext("note_title","primitivenotes"),document.getElementById("editnote").classList.add("disabled"),document.getElementById("deletenote").classList.add("disabled"),document.getElementById("sendnote").classList.add("disabled")}function edit_note(){let nTitel=$("#notescontentframe").contents().find("#headerTitle");$("#notescontentframe").contents().find("#tbutton").remove();let nname=document.createElement("input");nname.id="note_name",nname.name=nname.id,nname.type="text",nname.style="font-size: 2em",nname.required=!0,nname.value=nTitel[0].innerText,nTitel.replaceWith(nname);let tstate={tstate:!1,editor:"edit"};document.getElementById("notescontentframe").contentWindow.postMessage(tstate,location.href),$("#notescontentframe").contents().find("tags").addClass("edit")}function delete_note(){var a=window.frames.notescontentframe.document.getElementById("fname").value,b=window.frames.notescontentframe.document.getElementById("headerTitle").innerText,c=rcmail.gettext("note_del_note","primitivenotes").replace("%note%",b);if(a&&b){if(!confirm(c))return!1;$.ajax({url:"plugins/primitivenotes/notes.php",type:"post",data:{action:"delNote",mode:"delete",fileid:a},success:function(a){if(""!=a){var result=JSON.parse(a);""!=result.data&&confirm(result.message)&&$.ajax({url:"plugins/primitivenotes/notes.php",type:"post",data:{action:"delMedia",files:JSON.stringify(result.data)}})}document.getElementById("notescontentframe").src="plugins/primitivenotes/notes.php"}})}}function send_note(){var a=window.frames.notescontentframe.document.getElementById("fname").value,b=a.substring(a.lastIndexOf(".")+1);-1<"html pdf jpg png md txt".split(" ").indexOf(b)?rcmail.goto_url("mail/compose",{_note_type:b,_note_filename:a},!0):alert(rcmail.gettext("note_inv_format","primitivenotes"))}function sform(){fileName=this.value;for(var allowed_extensions=new Array("html","pdf","jpg","png","md","txt"),file_extension=fileName.split(".").pop().toLowerCase(),i=0;i<=allowed_extensions.length;i++)if(allowed_extensions[i]==file_extension)return document.getElementById("upl_form").submit(),!0;return alert('<roundcube:label name="primitivenotes.note_inv_format" />'),!1}window.rcmail&&rcmail.addEventListener("init",(function(a){rcmail.register_command("newnote",new_note,!0),rcmail.register_command("editnote",edit_note,!0),rcmail.register_command("deletenote",delete_note,!0),rcmail.register_command("sendnote",send_note,!0),rcmail.register_command("addnote",add_note,!0),rcmail.register_command("mdnote",new_note,!0),rcmail.register_command("txtnote",new_note,!0),document.getElementById("upl").addEventListener("change",sform,!1)}));
\ No newline at end of file
diff --git a/notes.php b/notes.php
index 6ce5662..b9a0233 100644
--- a/notes.php
+++ b/notes.php
@@ -2,7 +2,7 @@
 /**
  * Roundcube Notes Plugin
  *
- * @version 2.0.0
+ * @version 2.0.1
  * @author Offerel
  * @copyright Copyright (c) 2021, Offerel
  * @license GNU General Public License, version 3
diff --git a/primitivenotes.php b/primitivenotes.php
index 0afeb12..486463e 100644
--- a/primitivenotes.php
+++ b/primitivenotes.php
@@ -2,7 +2,7 @@
 /**
  * Roundcube Notes Plugin
  *
- * @version 2.0.0
+ * @version 2.0.1
  * @author Offerel
  * @copyright Copyright (c) 2021, Offerel
  * @license GNU General Public License, version 3
@@ -160,7 +160,7 @@ function action() {
 
 	function content($attrib) {
 		$rcmail = rcmail::get_instance();
-		$this->include_script('js/primitivenotes.js');
+		$this->include_script('js/primitivenotes.min.js');
 		$attrib['src'] = 'plugins/primitivenotes/notes.php';
 		if (empty($attrib['id'])) $attrib['id'] = 'rcmailnotescontent';
 		$attrib['name'] = $attrib['id'];
diff --git a/skins/elastic/plugin.css b/skins/elastic/plugin.css
index 9d48164..33ad35a 100644
--- a/skins/elastic/plugin.css
+++ b/skins/elastic/plugin.css
@@ -93,7 +93,11 @@
     text-align: center;
     text-overflow: ellipsis;
     overflow-x: hidden;
-    line-height: 2.5;
+	line-height: 2.5;
+	outline: 0;
+}
+#newmenulink:before {
+    line-height: 40px;
 }
 .toolbar a.button::before {
 	display: block;
diff --git a/skins/elastic/plugin.min.css b/skins/elastic/plugin.min.css
index 3cc5025..4c92f0b 100644
--- a/skins/elastic/plugin.min.css
+++ b/skins/elastic/plugin.min.css
@@ -1 +1 @@
-.iframe-wrapper{height:calc(100% - 58px)}#content{width:100%}#newnote::before{content:"\f0fe";display:block;text-align:center}#notestoolbar a{font-family:Icons;font-size:1.35rem;font-style:normal}#notestoolbar a.button::before{margin-bottom:-29px;margin-top:-10px}#notestoolbar a .inner{font-family:Roboto,sans-serif;font-size:.65em;font-weight:400}#editnote::before{content:"\f044"}#deletenote::before{content:"\f2ed"}#sendnote::before{content:"\f1e1"}#addnote::before{content:"\f093"}.iframebox.simplenotes_{height:100%}#pluginbody{height:100%}#newmenu-menu li a{color:#000!important}#notestoolbar a.dropdown{min-width:inherit!important;max-width:inherit!important;width:16px!important;padding:0!important}#newnote{padding-right:0!important;max-width:45px!important;min-width:0!important;text-align:right!important}#notestoolbar a.dropdown::before{width:16px!important}#taskbar a.button-notes span.button-inner{background:url(images/notes002.png) no-repeat;background-position:0 0;display:inline-block}#taskbar a.button-notes.button-selected span.button-inner,#taskbar a.button-notes:hover span.button-inner{background-position:0 -24px}.menuentry{color:#fff!important}.menuentry:hover{background:#0883d0}#notestoolbar{top:-2px;position:absolute;height:58px}.toolbar a.button:focus{color:#fff;background-color:rgba(30,150,192,.5)!important;border-radius:3px}#notestoolbar a.button{overflow:hidden;display:inline-block;border:0!important;min-width:3.5rem;max-width:6rem;width:auto;padding:.5rem .45rem .45rem;text-align:center;text-overflow:ellipsis;overflow-x:hidden;line-height:2.5}.toolbar a.button::before{display:block}#notestoolbar .disabled{pointer-events:none}.upl{display:none}.listing.iconized tr.primitivenotes>td.section::before{content:"\f249"}
\ No newline at end of file
+.iframe-wrapper{height:calc(100% - 58px)}#content{width:100%}#newnote::before{content:"\f0fe";display:block;text-align:center}#notestoolbar a{font-family:Icons;font-size:1.35rem;font-style:normal}#notestoolbar a.button::before{margin-bottom:-29px;margin-top:-10px}#notestoolbar a .inner{font-family:Roboto,sans-serif;font-size:.65em;font-weight:400}#editnote::before{content:"\f044"}#deletenote::before{content:"\f2ed"}#sendnote::before{content:"\f1e1"}#addnote::before{content:"\f093"}.iframebox.simplenotes_{height:100%}#pluginbody{height:100%}#newmenu-menu li a{color:#000!important}#notestoolbar a.dropdown{min-width:inherit!important;max-width:inherit!important;width:16px!important;padding:0!important}#newnote{padding-right:0!important;max-width:45px!important;min-width:0!important;text-align:right!important}#notestoolbar a.dropdown::before{width:16px!important}#taskbar a.button-notes span.button-inner{background:url(images/notes002.png) no-repeat;background-position:0 0;display:inline-block}#taskbar a.button-notes.button-selected span.button-inner,#taskbar a.button-notes:hover span.button-inner{background-position:0 -24px}.menuentry{color:#fff!important}.menuentry:hover{background:#0883d0}#notestoolbar{top:-2px;position:absolute;height:58px}.toolbar a.button:focus{color:#fff;background-color:rgba(30,150,192,.5)!important;border-radius:3px}#notestoolbar a.button{overflow:hidden;display:inline-block;border:0!important;min-width:3.5rem;max-width:6rem;width:auto;padding:.5rem .45rem .45rem;text-align:center;text-overflow:ellipsis;overflow-x:hidden;line-height:2.5;outline:0}#newmenulink:before{line-height:40px}.toolbar a.button::before{display:block}#notestoolbar .disabled{pointer-events:none}.upl{display:none}.listing.iconized tr.primitivenotes>td.section::before{content:"\f249"}
\ No newline at end of file
diff --git a/skins/elastic/templates/template.html b/skins/elastic/templates/template.html
index c60242d..f776473 100644
--- a/skins/elastic/templates/template.html
+++ b/skins/elastic/templates/template.html
@@ -3,36 +3,29 @@
 <h1 class="voice"><roundcube:label name="primitivenotes.notes" /></h1>
 <div id="content" class="content selected" role="main">
 	<div class="header">
-		<a class="button icon menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
-		<div id="notestoolbar" class="toolbar" role="toolbar">
-			<span class="dropbutton">
-				<roundcube:button innerclass="inner" id="newnote" command="newnote" type="link" class="button create" label="primitivenotes.note_new" title="primitivenotes.note_new" />
-				<a href="#new-note" class="button dropdown" id="newmenulink" aria-haspopup="true" aria-expanded="false" data-popup="newmenu-menu" aria-owns="newmenu-menu" tabindex="0">
+		<ul class="menu toolbar listing iconized">
+			<li role="menuitem">
+				<span class="dropbutton active">
+					<roundcube:button innerclass="inner" id="newnote" command="newnote" type="link" class="button create" label="primitivenotes.note_new" title="primitivenotes.note_new" />
+					<a href="#new-note" class="button dropdown" id="newmenulink" aria-haspopup="true" aria-expanded="false" data-popup="newmenu-menu" aria-owns="newmenu-menu" tabindex="0">
 				</a>
-			</span>
-			<roundcube:button innerclass="inner" id="editnote" command="editnote" type="link" class="button edit disabled" label="primitivenotes.note_edit" title="primitivenotes.note_edit" />
-			<roundcube:button innerclass="inner" id="deletenote" command="deletenote" type="link" class="button delete disabled" label="primitivenotes.note_del" title="primitivenotes.note_del" />
-			<roundcube:button innerclass="inner" id="sendnote" command="sendnote" type="link" class="button send disabled" label="primitivenotes.note_send" title="primitivenotes.note_send" />
-			<roundcube:button innerclass="inner" id="addnote" command="addnote" type="link" class="button upload" label="primitivenotes.note_upload" title="primitivenotes.note_upload" />
-			<form id="upl_form" method="POST" enctype="multipart/form-data"><input name="path" value="<roundcube:var name="env:npath" />" type="hidden" /><input type="file" id="upl" class="upl" name="files" onchange="javascript:sform(this.value);" /></form>
-			<script>
-			function sform(fileName) {
-				var allowed_extensions = new Array('html', 'pdf', 'jpg', 'png', 'md', 'txt');
-				var file_extension = fileName.split('.').pop().toLowerCase(); 
-
-				for(var i = 0; i <= allowed_extensions.length; i++)
-				{
-					if(allowed_extensions[i]==file_extension)
-					{
-						document.getElementById("upl_form").submit();
-						return true;
-					}
-				}
-				alert('<roundcube:label name="primitivenotes.note_inv_format" />');
-				return false;
-			}
-			</script>
-		</div>
+				</span>
+			</li>
+			<li role="menuitem">
+				<roundcube:button innerclass="inner" id="editnote" command="editnote" type="link" class="button edit disabled" label="primitivenotes.note_edit" title="primitivenotes.note_edit" />
+			</li>
+			<li>
+				<roundcube:button innerclass="inner" id="deletenote" command="deletenote" type="link" class="button delete disabled" label="primitivenotes.note_del" title="primitivenotes.note_del" />
+			</li>
+			<li>
+				<roundcube:button innerclass="inner" id="sendnote" command="sendnote" type="link" class="button send disabled" label="primitivenotes.note_send" title="primitivenotes.note_send" />
+			</li>
+			<li>
+				<roundcube:button innerclass="inner" id="addnote" command="addnote" type="link" class="button upload" label="primitivenotes.note_upload" title="primitivenotes.note_upload" />
+			</li>
+			<form id="upl_form" method="POST" enctype="multipart/form-data"><input name="path" value="<roundcube:var name="env:npath" />" type="hidden" /><input type="file" id="upl" class="upl" name="files" /></form>
+		</ul>
+		<a class="button icon menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
 	</div>
 	<div class="iframe-wrapper">
 		<div id="pluginbody" class="offset">
@@ -42,7 +35,6 @@ <h1 class="voice"><roundcube:label name="primitivenotes.notes" /></h1>
 		</div>
 		<div id="newmenu" class="popupmenu" aria-hidden="true">
 			<ul id="newmenu-menu" class="toolbarmenu listing" role="menu">
-				<roundcube:button type="link-menuitem" command="htmlnote" class="menuentry" label="primitivenotes.note_formathtml" prop="html" />
 				<roundcube:button type="link-menuitem" command="mdnote" class="menuentry" label="primitivenotes.note_formatmd" prop="md" />
 				<roundcube:button type="link-menuitem" command="txtnote" class="menuentry" label="primitivenotes.note_formattxt" prop="txt" />
 				<roundcube:container name="newmenu" id="newmenu-menu" />