diff --git a/infoscreen/templates/infoscreen_admin.html b/infoscreen/templates/infoscreen_admin.html
index 032550f..04e80d9 100644
--- a/infoscreen/templates/infoscreen_admin.html
+++ b/infoscreen/templates/infoscreen_admin.html
@@ -34,6 +34,8 @@
             <ul class="nav nav-tabs" role="tablist">
                 <li class="active"><a data-toggle="tab" href="#slides" role="tab">Slides</a></li>
                 <li class="nav-item"><a data-toggle="tab" href="#rotations " role="tab">Rotations</a></li>
+                <li class="nav-item"><a data-toggle="tab" href="#deleterot " role="tab">Manage Rotations</a></li>
+
             </ul>
             <div class="tab-content">
                 <div id="slides" class="tab-pane active">
@@ -59,15 +61,11 @@
                                 <tr>
                                     <th>{% trans "Item" %}</th>
                                     <th>{% trans "Type" %}</th>
-                                    <th>{% trans "Set duration" %}</th>
-                                    <th>{% trans "Add to rotation" %}</th>
                                     <th>{% trans "Delete" %}</th>
                                 </tr>
                                 <tr ng-repeat="i in infoitems | orderBy:['display_name','name']">
                                     <td>{$ i.name $}</td>
                                     <td>{$ i.display_name $}</td>
-                                    <td><input type="number" min="1" max="60" class="form-control" ng-model="i.duration"></input></td>
-                                    <td><input type="button" class="btn btn-success" ng-click="createInstance(selected_rot.id, i.id, i.item_type, i.duration);" value="{% trans "Add" %}"></input></td>
                                     <td><input type="button" class="btn btn-danger" ng-click="deleteItem(i.item_type, i.id);" value="{% trans "Delete" %}"></input></td>
                                 </tr>
                             </table>
@@ -75,7 +73,28 @@
                         </div>
                     </div>
                 </div>
-                <div id="rotations" class="tab-pane">
+                <div id="rotations" class="tab-pane" ng-controller="infoadmin_ctrl">
+                    <div class="col-xs-12 col-md-6">
+                        <h2>{% trans "Info items" %}</h2>
+                        <div>{% trans "Infoitems available for rotations" %}</div>
+                        <table class="table table-striped">
+                            <tr>
+                                <th>{% trans "Item" %}</th>
+                                <th>{% trans "Type" %}</th>
+                                <th>{% trans "Set duration" %}</th>
+                                <th>{% trans "Add to rotation" %}</th>
+                                <th>{% trans "Delete" %}</th>
+                            </tr>
+                            <tr ng-repeat="i in infoitems | orderBy:['display_name','name']">
+                                <td>{$ i.name $}</td>
+                                <td>{$ i.display_name $}</td>
+                                <td><input type="number" min="1" max="60" class="form-control" ng-model="i.duration"></input></td>
+                                <td><input type="button" class="btn btn-success" ng-click="createInstance(selected_rot.id, i.id, i.item_type, i.duration);" value="{% trans "Add" %}"></input></td>
+                                <td><input type="button" class="btn btn-danger" ng-click="deleteItem(i.item_type, i.id);" value="{% trans "Delete" %}"></input></td>
+                            </tr>
+                        </table>
+
+                    </div>
                     <div class="col-xs-12 col-md-6" ng-controller="infoadmin_ctrl">
                         <h2>{% trans "Rotations" %}</h2>
                         <div>
@@ -106,6 +125,7 @@
                         </table>
                     </div>
 
+
                     <div class="col-xs-12 col-md-6">
                         <h2>{% trans "Rotation" %}: {$ selected_rot.name $}</h2>
                         <div>{% trans "Instances in currently selected rotation" %}:</div>
@@ -122,6 +142,34 @@
                         </table>
                     </div>
                 </div>
+                <div id="deleterot" class="tab-pane">
+                    <div class="col-xs-12 col-md-6" ng-controller="infoadmin_ctrl">
+                        <h2>{% trans "Rotations" %}</h2>
+                        <div>
+                            {% trans "Select rotation to edit" %}:
+                        </div>
+                        <table class="table table-striped">
+                            <tr>
+                                <th>{% trans "Rotation" %}</th>
+                                <th>{% trans "id" %}</th>
+                                <th>{% trans "Preview" %}</th>
+                                <th>{% trans "Delete" %}</th>
+                            </tr>
+                            <tr ng-repeat="r in rotations">
+                                <td>{$ r.name $}</td>
+                                <td>{$ r.id $}</td>
+                                <td><a href="/infoscreen/{$ r.id $}"><input type="button" class="btn btn-primary" value="{% trans "Preview" %}"></a></td>
+                                <td><input type="button" class="btn btn-danger" ng-click="deleteRotation(r.id)" value="{% trans "Delete" %}"></input></td>
+                            </tr>
+                            <tr>
+                                <td><input type="text" class="form-control" ng-model="r.name" placeholder="{% trans "Name" %}"></input></td>
+                                <td><input type="button" class="btn btn-success" ng-click="createRotation(r.name)" value="{% trans "Create new" %}"></input></td>
+                                <td></td>
+                                <td></td>
+                            </tr>
+                        </table>
+                    </div>
+                </div>
             </div>
             </div>
             <div style="margin-top: 100px;">