diff --git a/media/css/style.css b/media/css/style.css
index 69e35f9..a27ac26 100644
--- a/media/css/style.css
+++ b/media/css/style.css
@@ -798,9 +798,6 @@ body.detail section.main div.inner section.snipts article.snipt div.container:af
 body.detail section.main div.inner section.snipts article.snipt aside {
   margin-right: 0;
 }
-body.detail section.main div.inner section.snipts article.editing div.container {
-  width: 100%;
-}
 body.detail div.rochester-made {
   width: 840px;
 }
@@ -894,6 +891,29 @@ body.api-contest a.aea img {
 body.editing header.main, body.editing header.sub {
   display: none;
 }
+body.editing header.fixed-save {
+  background: white url("/static/images/header-fixed-save.gif") top left repeat;
+  border-bottom: 1px solid #DDDDDD;
+  height: 40px;
+  left: 0;
+  position: fixed;
+  top: 0;
+  width: 100%;
+  z-index: 49;
+}
+body.editing header.fixed-save div.inner {
+  float: none;
+  margin: 0 auto;
+  padding-top: 6px;
+  width: 940px;
+}
+body.editing header.fixed-save div.inner .cancel, body.editing header.fixed-save div.inner .save {
+  float: right;
+  margin-left: 10px;
+}
+body.editing header.fixed-save div.inner .save {
+  margin-right: 99px;
+}
 body.editing article.editing {
   margin-top: 50px;
 }
@@ -906,7 +926,6 @@ body.editing article.editing div.container section.code div#editor {
   font-weight: normal !important;
   margin: 0;
   position: relative;
-  width: 100%;
 }
 body.editing article.editing div.container section.code div#editor .ace_print_margin {
   display: none;
@@ -914,3 +933,9 @@ body.editing article.editing div.container section.code div#editor .ace_print_ma
 body.editing article.editing div.container:after {
   display: none;
 }
+body.editing article.editing aside div.inner {
+  padding-left: 10px;
+}
+body.editing article.editing aside div.inner button {
+  width: 89px;
+}
diff --git a/media/css/style.scss b/media/css/style.scss
index c2fcc96..bc37d1b 100644
--- a/media/css/style.scss
+++ b/media/css/style.scss
@@ -924,11 +924,6 @@ body.detail {
                         margin-right: 0;
                     }
                 }
-                article.editing {
-                    div.container {
-                        width: 100%;
-                    }
-                }
             }
         }
     }
@@ -1031,6 +1026,31 @@ body.editing {
     header.main, header.sub {
         display: none;
     }
+    header.fixed-save {
+        background: #FFF url('/static/images/header-fixed-save.gif') top left repeat;
+        border-bottom: 1px solid #DDDDDD;
+        height: 40px;
+        left: 0;
+        position: fixed;
+        top: 0;
+        width: 100%;
+        z-index: 49;
+
+        div.inner {
+            float: none;
+            margin: 0 auto;
+            padding-top: 6px;
+            width: 940px;
+
+            .cancel, .save {
+                float: right;
+                margin-left: 10px;
+            }
+            .save {
+                margin-right: 99px;
+            }
+        }
+    }
     article.editing {
         margin-top: 50px;
 
@@ -1044,7 +1064,6 @@ body.editing {
                     font-weight: normal !important;
                     margin: 0;
                     position: relative;
-                    width: 100%;
 
                    .ace_print_margin {
                         display: none;
@@ -1055,5 +1074,14 @@ body.editing {
                 display: none;
             }
         }
+        aside {
+            div.inner {
+                padding-left: 10px;
+
+                button {
+                    width: 89px;
+                }
+            }
+        }
     }
 }
diff --git a/media/images/header-fixed-save.gif b/media/images/header-fixed-save.gif
new file mode 100644
index 0000000..684351e
Binary files /dev/null and b/media/images/header-fixed-save.gif differ
diff --git a/templates/base.html b/templates/base.html
index f63bb40..9a73ab0 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -309,6 +309,13 @@
                     </div>
                 </script>
                 <script id="edit" type="text/html">
+                    <header class="fixed-save">
+                        <div class="inner group">
+                            <button class="delete btn btn-danger">Delete</button>
+                            <button class="save btn btn-success">Save</button>
+                            <button class="cancel btn btn-secondary">Cancel</button>
+                        </div>
+                    </header>
                     <div class="inner">
                         <section class="snipts" id="snipts">
                             <article id="snipt-<%= snipt.pk %>" class="snipt editing">
@@ -325,6 +332,15 @@
                                         <div class="ruler top-x"></div>
                                         <div class="ruler bottom-x"></div>
                                     </div>
+                                    <aside>
+                                        <div class="inner">
+                                            <label>
+                                                Public
+                                                <input type="checkbox" name="" value="" />
+                                            </label>
+                                            <textarea>Tags</textarea>
+                                        </div>
+                                    </aside>
                                 </div>
                             </article>
                         </section>