diff --git a/infoscreen/templates/infoscreen_admin.html b/infoscreen/templates/infoscreen_admin.html
index 6fd4ead..7ab1d90 100644
--- a/infoscreen/templates/infoscreen_admin.html
+++ b/infoscreen/templates/infoscreen_admin.html
@@ -50,7 +50,7 @@
                                 <tr>
                                     <td>{% trans "Item type" %}</td>
                                     <td>
-                                        <select class="form-control form-control-sm" ng-model="createtype", ng-options="t.name for t in infotypes">
+                                        <select class="form-control form-control-sm" ng-model="createtype", ng-options="t.name for t in infotypes | orderBy: 'name'">
                                             <option value=""></option>
                                         </select>
                                     </td>
@@ -102,8 +102,7 @@
 
                     <div class="col-xs-12 col-md-6">
                         <div class="row">
-                        <h2>{% trans "Rotation" %}: {$ selected_rot.name $}<a href="/infoscreen/{$ selected_rot.id $}"><input type="button" class="btn btn-primary pull-right" value="{% trans "Preview" %}"></a></td></h2>
-
+                        <h2>{% trans "Rotation" %}: {$ selected_rot.name $}<a href="/infoscreen/{$ selected_rot.id $}"><input type="button" class="btn btn-primary pull-right" value="{% trans "Preview" %}"></a></h2>
                         <div>{% trans "Instances in currently selected rotation" %}:</div>
                         <table class="table table-striped">
                             <tr>