diff --git a/static/script.js b/static/script.js
index 99a363b..336bfff 100644
--- a/static/script.js
+++ b/static/script.js
@@ -14,7 +14,7 @@ function getDate(){
     var day = d.getDate();
     var month = 1+d.getMonth();
     if (month < 10) { month = "0" + month; }
-    var year = d.getFullYear();
+    var year = d.getFullYear().toString().substr(-2);
     return year+"-"+month+"-"+day+" "+hr+":"+min
 }
 
diff --git a/templates/show_shop.html b/templates/show_shop.html
index ccc4d12..83e733d 100644
--- a/templates/show_shop.html
+++ b/templates/show_shop.html
@@ -27,8 +27,9 @@
     <form name="area_add" action="{{ url_for('add_items') }}" method=post class=add-entry>
       <dl>
         <dt><textarea cols=40 rows=1 id=add_md name=add_md onkeyup="growTextarea('add_md')"></textarea>
-        <dt><input type=hidden name=shopid value={{ shopid }}><input class="submit submitNextTo" type=submit value="Add items">
-        <input class="submit notify" type=button value="Insert Date" onclick="insertDate('add_md');" >
+        <dt>
+          <input type=hidden name=shopid value={{ shopid }}><input class="submit submitNextTo" type=submit value="Add items">
+          <input class="submit" type=button value="Insert Date" onclick="insertDate('add_md');" >
       </dl>
     </form>
     <hr>
@@ -36,13 +37,13 @@
       <span class="button-panel-col">
       <form action="{{ url_for('toggle_item') }}" method=post>
         <input type=hidden name=shopid value="{{ shopid }}">
-        <input class=submit type=submit name=toggleAll value="Invert selection">
+        <input class=submit type=submit name=toggleAll value="Invert ticks">
       </form>
       </span>
       <span class="button-panel">
         <form action="{{ url_for('toggle_item') }}" method=post>
           <input type=hidden name=shopid value="{{ shopid }}">
-          <input class=submit type=submit name=unTickAll value="Untick all items" onclick="return confirm('Do you really want to untick all entries?');">
+          <input class=submit type=submit name=unTickAll value="Clear ticks" onclick="return confirm('Do you really want to untick all entries?');">
         </form>
       </span>
     </div>
@@ -51,9 +52,9 @@
         <form action="{{ url_for('sort_flip') }}" method=post>
           <input type=hidden name=shopid value="{{ shopid }}">
           {% if autosort %}
-          <input class=submit type=submit name=toggleAll value="Autosort mode: On">
+          <input class=submit type=submit name=toggleAll value="Autosort: On">
           {% else  %}
-          <input class=submit type=submit name=toggleAll value="Autosort mode: Off">
+          <input class=submit type=submit name=toggleAll value="Autosort: Off">
           {% endif %}
         </form>
       </span>
@@ -67,9 +68,10 @@
   </div>
   <form id="disp_edit" class=hidden name="area_edit" action="{{ url_for('edit_md') }}" method=post class=add-entry>
       <dl>Edit content file:
-        <dt><textarea cols=40 rows=5 id=edit_md name=edit_md onkeyup="growTextarea('edit_md')">{{ content }}</textarea><br>
+        <dt><textarea cols=40 rows=5 id=edit_md name=edit_md onkeyup="growTextarea('edit_md')">{{ content }}</textarea>
+        <dt>
         <input type=hidden name=shopid value={{ shopid }}><input class="submit notify" type=submit value=Save onclick="return confirm('Do you really want to replace content?');" >
-        <input class="submit notify" type=button value="Insert Date" onclick="insertDate('edit_md');" >
+        <input class="submit" type=button value="Insert Date" onclick="insertDate('edit_md');" >
       </dl>
   </form>
   <div class=hidden id=disp_share>