diff --git a/shop.py b/shop.py
index 12e226d..a764b84 100644
--- a/shop.py
+++ b/shop.py
@@ -128,6 +128,7 @@ def show_shop(shopid):
     content=open(data_file, 'rt').read().decode('utf-8')
     for i,row in enumerate(open( data_file, 'rt').read().decode('utf-8').split("\n")):
         # any parsing magick would be here
+        row=row.rstrip()
         if row=="":
             continue
         icon=" "
diff --git a/static/script.js b/static/script.js
index 4950222..ee08ebb 100644
--- a/static/script.js
+++ b/static/script.js
@@ -51,3 +51,16 @@ window.onclick = function(event) {
     }
   }
 }
+
+function sortMarkdown() {
+  var divs = document.getElementsByClassName("entry");
+  divs = Array.prototype.slice.call(divs, 0);
+  divs.sort(function(a, b) {
+    return a.children[1].innerHTML.localeCompare(b.children[1].innerHTML);  
+  });
+  var parent = document.getElementById('entry_loop');
+  parent.innerHTML = "";
+  for(var i = 0, l = divs.length; i < l; i++) {
+    parent.appendChild(divs[i]);
+  }  
+}
diff --git a/templates/layout.html b/templates/layout.html
index 1025731..b70b6a4 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -29,6 +29,7 @@
     <div class="dropdown">
       <p onclick="dropDown('shopAct')" class="dropbtn">&#9757;&#9748;</p>
       <div id="shopAct" class="dropdown-content">
+        <a id="h2_sort" onclick="sortMarkdown()" class=pointer>↕&nbsp;Sort&nbsp;items</a>  
         <a id="h2_edit" onclick="hidetoggle('disp_edit');growTextarea('edit_md');" class=pointer>&#x270e;&nbsp;Edit&nbsp;items</a>
         <a id="h2_share" onclick="hidetoggle('disp_share')" class=pointer>&#9823;&nbsp;Share&nbsp;shop</a>
         <a id="h2_restore" onclick="hidetoggle('disp_restore')" class=pointer>&#9851;&nbsp;Restore&nbsp;backup</a>
diff --git a/templates/show_shop.html b/templates/show_shop.html
index ae1d413..1b5a861 100644
--- a/templates/show_shop.html
+++ b/templates/show_shop.html
@@ -2,11 +2,13 @@
 {% block body %}
   <H2># {{ shop }}</H2>
   <div class=entries>
-      <form action="{{ url_for('toggle_item') }}" method=post class=toggle-item>
-      <input type=hidden name=shopid value="{{ shopid }}" >
+     <form action="{{ url_for('toggle_item') }}" method=post class=toggle-item>
+     <input type=hidden name=shopid value="{{ shopid }}" >
+     <div id="entry_loop">
   {% for entry in entries %}
-     <input class="submit tickbox {{ entry.extra_class }}" type=submit name=item{{ entry.row }} value="{{ entry.icon }}" >{{ entry.text|safe }}<br>
+     <div class=entry><input class="submit tickbox {{ entry.extra_class }}" type=submit name=item{{ entry.row }} value="{{ entry.icon }}" ><span class=md_entry>{{ entry.text|safe }}</span><br></div>
   {% endfor %}
+     </div>
      </form>
   <div id=date>{{ date }}</div>
   </div>