diff --git a/gallery/templates/gallery/photo_list.html b/gallery/templates/gallery/photo_list.html
index 03cdcde..fda6163 100644
--- a/gallery/templates/gallery/photo_list.html
+++ b/gallery/templates/gallery/photo_list.html
@@ -23,17 +23,17 @@
                 <li class="uk-visible@m uk-disabled"><a>{% trans "Photostream" %}</a></li>
             </ul>
             <!-- Sort menu -->
-            <ul class="uk-subnav uk-subnav-divider uk-margin-remove uk-flex uk-flex-middle uk-margin-medium-top@s">
-                <li {% if order == 'latest' %}class="uk-active"{% endif %}>
-                    <a href="{% search_link 'latest' request.GET %}">{% trans "Latest" %}</a>
-                </li>
-                <li {% if order == 'liked' %}class="uk-active"{% endif %}>
-                    <a href="{% search_link 'liked' request.GET %}">{% trans "Liked" %}</a>
-                </li>
-                <li {% if order == 'popular' %}class="uk-active"{% endif %}>
-                    <a href="{% search_link 'popular' request.GET %}">{% trans "Popular" %}</a>
-                </li>
-            </ul>
+            <div class="uk-button-group">
+                <a href="{% search_link 'latest' request.GET %}" class="uk-button uk-button-small {% if order == 'latest' %}uk-button-primary{% else %}uk-button-default{% endif %}">
+                    {% trans "Latest" %}
+                </a>
+                <a href="{% search_link 'liked' request.GET %}" class="uk-button uk-button-small {% if order == 'liked' %}uk-button-primary{% else %}uk-button-default{% endif %}">
+                    {% trans "Liked" %}
+                </a>
+                <a href="{% search_link 'popular' request.GET %}" class="uk-button uk-button-small {% if order == 'popular' %}uk-button-primary{% else %}uk-button-default{% endif %}">
+                    {% trans "Popular" %}
+                </a>
+            </div>
         </div>
     </div>