diff --git a/templates/admin_topic_show.html b/templates/admin_topic_show.html
index 0bf7acc054e2acec2eb8c1511391a2dad6bd55b9..f55eee5d57ccc01df2b8ce38c3953841776ac3a1 100644
--- a/templates/admin_topic_show.html
+++ b/templates/admin_topic_show.html
@@ -6,10 +6,13 @@
     <div class="mdl-cell mdl-cell--6-col mdl-cell--5-col-tablet mdl-cell--4-col-phone mdl-grid mdl-grid--no-spacing">
         <table class="mdl-data-table mdl-js-table mdl-shadow--2dp mdl-cell mdl-cell--12-col">
             <thead>
+		<tr>
+                    <th class="mdl-data-table__cell-non-numeric rede-large-text" style="text-align:center;" colspan="5">{{ topic.event.name }}</th>
+		</tr>
                 <tr>
-                    <th class="mdl-data-table__cell-non-numeric rede-large-text">{{ topic.name }}</th>
-                    <th class="mdl-data-table__cell-non-numeric rede-medium-text" colspan=2>{{ topic.mode }}</th>
-                    <th class="mdl-data-table__cell-non-numeric rede-medium-text"><a href="{{ url_for(".topic_edit", id=topic.id) }}"><i class="material-icons">edit</i></a></th>
+                    <th class="mdl-data-table__cell-non-numeric rede-large-text" style="text-align:center;" colspan="3">{{ topic.name }}</th>
+                    <th class="mdl-data-table__cell-non-numeric rede-medium-text" style="text-align:center;">{{ topic.mode }}</th>
+                    <th class="mdl-data-table__cell-non-numeric rede-medium-text" style="text-align:center;"><a href="{{ url_for(".topic_edit", id=topic.id) }}"><i class="material-icons">edit</i></a></th>
                 </tr>
                 <tr>
                     <th class="mdl-data-table__cell--non-numeric">Speaker</th>
@@ -60,8 +63,6 @@
                 </li>
                 {% endif %}
                 <li><a href="{{ url_for(".statement_undo", topic_id=topic.id) }}" class="rede-href"><i class="material-icons" role="presentation">undo</i> Previous</a></li>
-                <li><a href="{{ url_for(".topic_show", id=topic.get_next_index()) }}"><i class="material-icons">arrow_forward</i> Next Topic</a></li>
-                <li><a href="{{ url_for(".topic_show", id=topic.get_previous_index()) }}"><i class="material-icons">arrow_backward</i>Previous Topic</a></li>
                 <li>
                     <form action="{{ url_for(".pause", id=topic.event.id, original=topic.id) }}" method="POST">
                         <button class="mdl-button">
@@ -98,7 +99,8 @@
             </ul>
         </div>
     </div>
-    <div class="mdl-cell mdl-cell--3-col mdl-cell--3-col-tablet mdl-cell--4-col-phone mdl-card mdl-shadow--2dp">
+    <div class="mdl-cell mdl-cell--3-col mdl-cell--3-col-tablet mdl-cell--4-col-phone mdl-grid mdl-grid--no-spacing">
+	<div class="mdl-cell mdl-cell--12-col mdl-cell--8-col-tablet mdl-cell--4-col-phone mdl-card mdl-shadow--2dp" >
         <div class="mdl-card__title">
             <h4 class="mdl-card__title-text">Topics</h4>
         </div>
@@ -121,6 +123,17 @@
             <tr>
         {% endfor %}
         </table>
+        <table style="width:100%" >
+                <tr>
+                        <td>
+                                <a href="{{ url_for(".topic_show", id=topic.get_previous_index()) }}"><i class="material-icons" style="heigth: 16pt; width:16pt;">arrow_backward</i>Previous</a>
+                        </td>
+                        <td>
+                                <a href="{{ url_for(".topic_show", id=topic.get_next_index()) }}"> Next <i class="material-icons" style="height:16pt; width:16pt;">arrow_forward</i></a>   
+                        </td>
+                </tr>
+        </table>
+</div>
     </div>
     {% if topic.event.paused %}
     <div class="mdl-cell mdl-cell--12-col mdl-cell--8-col-tablet mdl-cell--4-col-phone mdl-card mdl-shadow--2dp">