4 files changed, 27 insertions, 10 deletions
diff --git a/client/components/boards/boardBody.jade b/client/components/boards/boardBody.jade
index fd094a93..76a85d87 100644
--- a/client/components/boards/boardBody.jade
+++ b/client/components/boards/boardBody.jade
@@ -7,8 +7,8 @@ template(name="board")
         +boardBody
     else
       //-- XXX We need a better error message in case the board has been archived
-      //-- +message(label="board-not-found")
-      | {{goHome}}
+      +message(label="board-not-found")
+      //-- | {{goHome}}
   else
     +spinner
 
diff --git a/client/components/boards/boardColors.styl b/client/components/boards/boardColors.styl
index efd4367e..3be9c0c3 100644
--- a/client/components/boards/boardColors.styl
+++ b/client/components/boards/boardColors.styl
@@ -241,6 +241,7 @@ setBoardColor(color)
             background-color #ffffff !important
             padding 15px !important
             border 1px solid #000000 !important
+            word-wrap: break-word
 
   // When card has comment, emphasis on minicard:
   // bigger red comment icon and number of comments,
diff --git a/client/components/boards/boardsList.jade b/client/components/boards/boardsList.jade
index 85f47963..79bae502 100644
--- a/client/components/boards/boardsList.jade
+++ b/client/components/boards/boardsList.jade
@@ -31,12 +31,28 @@ template(name="boardList")
                   i.fa.js-has-spenttime-cards(
                     class="fa-circle{{#if hasOvertimeCards}} has-overtime-card-active{{else}} no-overtime-card-active{{/if}}"
                     title="{{#if hasOvertimeCards}}{{_ 'has-overtime-cards'}}{{else}}{{_ 'has-spenttime-cards'}}{{/if}}")
-                i.fa.js-clone-board(
-                    class="fa-clone"
-                    title="{{_ 'duplicate-board'}}")
-                i.fa.js-archive-board(
-                    class="fa-archive"
-                    title="{{_ 'archive-board'}}")
+                unless isMiniScreen
+                  if isSandstorm
+                    i.fa.js-clone-board(
+                        class="fa-clone"
+                        title="{{_ 'duplicate-board'}}")
+                    i.fa.js-archive-board(
+                        class="fa-archive"
+                        title="{{_ 'archive-board'}}")
+                  else if currentUser.isBoardAdmin
+                    i.fa.js-clone-board(
+                        class="fa-clone"
+                        title="{{_ 'duplicate-board'}}")
+                    i.fa.js-archive-board(
+                        class="fa-archive"
+                        title="{{_ 'archive-board'}}")
+                  else if currentUser.isAdmin
+                    i.fa.js-clone-board(
+                        class="fa-clone"
+                        title="{{_ 'duplicate-board'}}")
+                    i.fa.js-archive-board(
+                        class="fa-archive"
+                        title="{{_ 'archive-board'}}")
 
 template(name="boardListHeaderBar")
   h1 {{_ 'my-boards'}}
diff --git a/client/components/boards/boardsList.js b/client/components/boards/boardsList.js
index b1371747..3918af82 100644
--- a/client/components/boards/boardsList.js
+++ b/client/components/boards/boardsList.js
@@ -8,10 +8,10 @@ Template.boardListHeaderBar.events({
 
 Template.boardListHeaderBar.helpers({
   templatesBoardId() {
-    return Meteor.user().getTemplatesBoardId();
+    return Meteor.user() && Meteor.user().getTemplatesBoardId();
   },
   templatesBoardSlug() {
-    return Meteor.user().getTemplatesBoardSlug();
+    return Meteor.user() && Meteor.user().getTemplatesBoardSlug();
   },
 });