diff --git a/frontend/src/app/index.html b/frontend/src/app/index.html
index ff7c8551..5b79de61 100644
--- a/frontend/src/app/index.html
+++ b/frontend/src/app/index.html
@@ -35,7 +35,7 @@ <h1>Smarti Configuration</h1>
 
 <div class="footer">
   <div class="container">
-    <p><span class="glyphicon glyphicon-heart"></span> from the Redlink</p>
+    <p>with <span class="glyphicon glyphicon-heart"></span> from the Redlink Team</p>
   </div>
 </div>
 
diff --git a/frontend/src/app/scripts/controllers/conversation.js b/frontend/src/app/scripts/controllers/conversation.js
index 875cbb97..269be42a 100644
--- a/frontend/src/app/scripts/controllers/conversation.js
+++ b/frontend/src/app/scripts/controllers/conversation.js
@@ -35,12 +35,17 @@ angular.module('smartiApp')
     };
 
     $ctrl.openConversation = openConversation;
+    $ctrl.backToList = backToList;
 
     $scope.$watch('$ctrl.paging.currentPage', loadConversations);
     $scope.$watch('$ctrl.paging.pageSize', loadConversations);
 
     loadConversations();
 
+    function backToList() {
+      $location.path('/');
+    }
+
     function loadConversations() {
       $ctrl.conversations = null;
       return ConversationService.listForClient(client.data.id, $ctrl.paging.currentPage -1, $ctrl.paging.pageSize)
diff --git a/frontend/src/app/views/conversations.html b/frontend/src/app/views/conversations.html
index e53e07c6..2f77c1db 100644
--- a/frontend/src/app/views/conversations.html
+++ b/frontend/src/app/views/conversations.html
@@ -14,8 +14,12 @@
   ~ limitations under the License.
   ~
   -->
-
-<h2>Conversations for <span ng-bind="$resolve.client.data.name"></span></h2>
+<div class="clearfix">
+  <div class="pull-right">
+    <button class="btn btn-default" ng-click="$ctrl.backToList()">Back to List</button>
+  </div>
+  <h2>Conversations for <span ng-bind="$resolve.client.data.name"></span></h2>
+</div>
 <div>
   <div class="clearfix">
     <div class="pull-right">