diff --git a/html/templates/github-icon.jpeg b/html/templates/github-icon.jpeg
deleted file mode 100644
index a983aa5..0000000
Binary files a/html/templates/github-icon.jpeg and /dev/null differ
diff --git a/html/templates/github.jpg b/html/templates/github.jpg
deleted file mode 100644
index a58b1dd..0000000
Binary files a/html/templates/github.jpg and /dev/null differ
diff --git a/html/website/kamokan.css b/html/website/kamokan.css
index f3b1e42..a61e58b 100644
--- a/html/website/kamokan.css
+++ b/html/website/kamokan.css
@@ -2,7 +2,7 @@
 html {
 	margin: 0px;
 	padding: 0px;
-	width: 100%;
+	min-width: 100%;
 }
 
 body {
@@ -10,7 +10,7 @@ body {
     background: #303030;
     margin: 0px;
     padding-top: 0px;
-    width: 100%;
+    min-width: 100%;
 }
 
 /*style della barra di navigazione*/
@@ -55,13 +55,14 @@ body {
 .wrap {
 	margin: 20px;
 	width: 95%;
+	min-height: calc(90vh - 100px);
 }
 
 #PasteTextBox {
    background-color: #303030;
    color: #EDEDED;
    resize: none;
-   height: calc(95vh - 200px);
+   height: calc(80vh - 200px);
    width: 95%;
 }
 
@@ -102,12 +103,11 @@ body {
 }
 
 footer  {
-	margin-left: 30px;
-	bottom: 5px;
-	/*position: absolute;*/
+	padding-left: 30px;
+	position: relative;
 	font-size: 15px;
 	color: #EDEDED;
-	width: 100%;
+	width: calc(100% - 200px);
 }
 
 #numbers {
@@ -136,7 +136,6 @@ footer  {
 	word-wrap: break-word;
 }
 
-
 #message {
 	color: #EDEDED;
 	font-size: 22px;
diff --git a/html/website/pastie.html.mstch b/html/website/pastie.html.mstch
index f0cdfb3..fac5838 100644
--- a/html/website/pastie.html.mstch
+++ b/html/website/pastie.html.mstch
@@ -1,5 +1,6 @@
 {{> page2-top}}
 
+		{{highlight_comment}}
 		{{#pastie_lines}}
 			<div>
 
diff --git a/html/website/saved.html.mstch b/html/website/saved.html.mstch
index 65dfd2d..9bc437d 100644
--- a/html/website/saved.html.mstch
+++ b/html/website/saved.html.mstch
@@ -6,4 +6,4 @@
 <p>It will be deleted as soon as the link is open for the first time. Thanks for using KamoKan!</p>
 </div>
 
-{{> page2-bottom}}
+{{> page2-bottom}}
\ No newline at end of file
diff --git a/html/website/topbar.mustache b/html/website/topbar.mustache
index 4ae6756..b657dea 100644
--- a/html/website/topbar.mustache
+++ b/html/website/topbar.mustache
@@ -15,7 +15,10 @@
 		<a href="{{host_path}}/"><img src="{{host_path}}/Pictures/new-ink.png" alt="new icon" class="icon-green" title="New"/></a>
 
       {{#pastie_page}}
+      {{^selfdes}}
 		<a href="{{host_path}}/{{pastie_token}}"><img src="{{host_path}}/Pictures/text-ink.png" alt="text icon" class="icon-green" title="Text only"/></a>
+		<a href="{{host_path}}/edit.cgi?{{pastie_token}}"><img src="{{host_path}}/Pictures/edit-ink.png" alt="edit icon" class="icon-green" title="Edit"/></a>
+		{{/selfdes}}
       {{/pastie_page}}
 
 		{{> github }}