diff --git a/assets/sass/style.sass b/assets/sass/style.sass
index 19be44f29c106cff167bb445cd08e1aa4a8bcd57..615c5c54f302b84876d6ac15d52f7570b941a2a3 100644
--- a/assets/sass/style.sass
+++ b/assets/sass/style.sass
@@ -179,4 +179,8 @@ form.upload
     font-family: 'Lato', sans-serif
     resize: vertical
     &:not(input):not(textarea):empty
-      display: none
\ No newline at end of file
+      display: none
+
+.fake-input[contenteditable]:empty:before
+  opacity: 0.8
+  content: attr(placeholder)
\ No newline at end of file
diff --git a/templates/image_detail.html b/templates/image_detail.html
index 9a0a756c4fc4606010e244dcbaf57e0d815fdecb..13cca1f300c361131dc8026c35c7998d2cb17598 100644
--- a/templates/image_detail.html
+++ b/templates/image_detail.html
@@ -3,7 +3,7 @@
 <form class="detail" method="post">
     <input type="hidden" name="action" value="update">
 {{if .IsMine}}
-    <input name="title" class="title" value="{{.Image.Title}}" placeholder="Title">
+    <h2 class="title fake-input" contenteditable="true" placeholder="Title">{{.Image.Title}}</h2>
 {{else}}
     <h2 class="title">{{.Image.Title}}</h2>
 {{end}}
@@ -11,18 +11,9 @@
         <img src="/{{.Image.Id}}">
     </div>
 {{if .IsMine}}
-    <textarea name="description" class="description" placeholder="Description">{{.Image.Description}}</textarea>
+    <div class="description fake-input" contenteditable="true" placeholder="Description">{{.Image.Description}}</div>
 {{else}}
     <div class="description">{{.Image.Description}}</div>
 {{end}}
-{{if .IsMine}}
-    <div class="controls">
-        <form method="post" class="delete-form">
-            <input type="hidden" name="action" value="delete">
-            <input type="submit" value="Delete">
-        </form>
-        <input type="submit" value="Save">
-    </div>
-{{end}}
 </form>
 {{end}}
\ No newline at end of file