diff --git a/infoscreen/templates/infoscreen_admin.html b/infoscreen/templates/infoscreen_admin.html
index 307769e..d48c475 100644
--- a/infoscreen/templates/infoscreen_admin.html
+++ b/infoscreen/templates/infoscreen_admin.html
@@ -32,13 +32,14 @@
                 </div>
             </div>
             <ul class="nav nav-tabs" role="tablist">
-                <li class="active"><a data-toggle="tab" href="#slides" role="tab">Slides</a></li>
+                <li class="active"><a data-toggle="tab" href="#slides" role="tab">Manage Slides</a></li>
                 <li class="dropdown">
-                    <a data-toggle="dropdown" href="#">Rotations<span class="caret"></span></a>
+                    <a data-toggle="dropdown" href="#">Manage Rotations<span class="caret"></span></a>
                     <ul class="dropdown-menu">
                         <li ng-repeat="r in rotations"><a href="#rotations" ng-click="selectRotation(r.id)" data-toggle="tab">{$ r.name $}</a></li>
+                        <li class="divider">
+                        <li class="nav-item"><a data-toggle="tab" href="#deleterot" role="tab">Create/Delete</a></li>
                     </ul>
-                <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">
@@ -98,39 +99,11 @@
                         </table>
 
                     </div>
-                    <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 "Select" %}</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><input type="button" class="btn btn-info" ng-click="selectRotation(r.id)" value="{% trans "Select" %}"></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>
-                                <td></td>
-                            </tr>
-                        </table>
-                    </div>
-
 
                     <div class="col-xs-12 col-md-6">
-                        <h2>{% trans "Rotation" %}: {$ selected_rot.name $}</h2>
+                        <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>
+
                         <div>{% trans "Instances in currently selected rotation" %}:</div>
                         <table class="table table-striped">
                             <tr>