diff --git a/js/service/BoardService.js b/js/service/BoardService.js
index 1ebb9ef3e..d41c024c0 100644
--- a/js/service/BoardService.js
+++ b/js/service/BoardService.js
@@ -192,8 +192,8 @@ app.factory('BoardService', function(ApiService, $http, $q){
         return this.getCurrent().permissions['PERMISSION_EDIT'];
     };
 
-    BoardService.prototype.canManage = function(board = null) {
-    	if(board !== null) {
+    BoardService.prototype.canManage = function(board) {
+    	if(board !== null && board !== undefined) {
 			return board.permissions['PERMISSION_MANAGE'];
 		}
         if(!this.getCurrent() || !this.getCurrent().permissions) {
diff --git a/lib/Service/BoardService.php b/lib/Service/BoardService.php
index e7037553c..4387ab9eb 100644
--- a/lib/Service/BoardService.php
+++ b/lib/Service/BoardService.php
@@ -87,6 +87,13 @@ class BoardService {
 				$this->boardMapper->mapAcl($acl);
 			}
 		}
+		$permissions = $this->permissionService->matchPermissions($board);
+		$board->setPermissions([
+			'PERMISSION_READ' => $permissions[Acl::PERMISSION_READ],
+			'PERMISSION_EDIT' => $permissions[Acl::PERMISSION_EDIT],
+			'PERMISSION_MANAGE' => $permissions[Acl::PERMISSION_MANAGE],
+			'PERMISSION_SHARE' => $permissions[Acl::PERMISSION_SHARE]
+		]);
 		return $board;
 	}
 
diff --git a/templates/part.board.mainView.php b/templates/part.board.mainView.php
index e4f400885..2418c45f8 100644
--- a/templates/part.board.mainView.php
+++ b/templates/part.board.mainView.php
@@ -64,10 +64,7 @@
 							</ul>
 
 						</div>
-
-						<div class="card-assignees" ng-if="c.assignees">
-							<!--   <div class="avatar" avatar user="{{c.owner}}" size="24"></div>//-->
-						</div>
+						
 						<div class="card-controls">
 							<i class="icon icon-filetype-text" ng-if="c.description" title="{{ c.description }}"></i>
 							<div class="app-popover-menu-utils" ng-if="!boardservice.isArchived>
diff --git a/templates/part.board.sidebarView.php b/templates/part.board.sidebarView.php
index cb54dbfab..dbcb81767 100644
--- a/templates/part.board.sidebarView.php
+++ b/templates/part.board.sidebarView.php
@@ -9,6 +9,7 @@
     <h2>{{ boardservice.getCurrent().title }}</h2>
 </div>
 
+{{board=boardservice.getCurrent();""}}
 
 <ul class="tabHeaders">
     <li class="tabHeader" ng-class="{'selected': (status.boardtab==0 || !status.boardtab)}" ng-click="status.boardtab=0"><a><?php p($l->t('Sharing')); ?></a></li>
@@ -90,7 +91,7 @@
                     <input type="text" class="input-inline" ng-model="newLabel.title" style="color:{{ newLabel.color|textColorFilter }};" autofocus-on-insert maxlength="100" />
                 </span>
                         <div class="colorselect">
-                            <div class="color" ng-repeat="c in defaultColors" style="background-color:#{{ c }};" ng-click="newLabel.color=c" ng-class="{'selected': (c == newLabel.color) }"><br /></div>
+                            <div class="color" ng-repeat="c in defaultColors" style="background-color:#{{ c }};" ng-click="newLabel.color=c" ng-class="{'selected': (c == newLabel.color), 'dark': (newBoard.color | textColorFilter) === '#ffffff' }"><br /></div>
                         </div>
                         <a ng-click="labelCreate(newLabel)" class="icon"><i class="icon icon-checkmark" ></i></a>
                         <a ng-click="status.createLabel=false" class="icon icon-close"></a>
diff --git a/templates/part.boardlist.php b/templates/part.boardlist.php
index 35380a435..919ca9746 100644
--- a/templates/part.boardlist.php
+++ b/templates/part.boardlist.php
@@ -14,7 +14,7 @@
 				<span class="board-bullet"
 					  style="background-color:#{{b.color}};"> </span>
 			</td>
-			<td ng-click="gotoBoard(b)">{{ b.title }}</td>
+			<td ng-click="gotoBoard(b)">{{ b.title }}</a></td>
 			<td>
 				<div id="assigned-users">
 					<div class="avatardiv" avatar displayname="{{ b.owner.uid }}" title="{{ b.owner.displayname }}"></div>
@@ -23,7 +23,7 @@
 			</td>
 			<td>
 				<div class="hint"></div>
-				<div class="app-popover-menu-utils" ng-if="b.archived && b.deletedAt == 0">
+				<div class="app-popover-menu-utils" ng-if="b.deletedAt == 0">
 					<button class="icon icon-more" title="More actions"></button>
 					<div class="popovermenu bubble hidden">
 						<ul>
@@ -60,6 +60,7 @@
 				</a>
 			</td>
 		</tr>
+
 		<tr ng-if="status.filter === '' && status.addBoard">
 			<td><span class="icon icon-add"></span></td>
 			<td>
diff --git a/templates/part.navigation.php b/templates/part.navigation.php
index 96c9264fb..0e6282646 100644
--- a/templates/part.navigation.php
+++ b/templates/part.navigation.php
@@ -39,7 +39,7 @@
 				<input id="newTitle" class="edit ng-valid ng-empty" type="text" placeholder="<?php p($l->t('New board title')); ?>" autofocus-on-insert ng-model="newBoard.title" maxlength="100">
 				<input type="submit" value="" class="action icon-checkmark svg">
 				<div class="colorselect">
-					<div class="color" ng-repeat="c in colors" style="background-color:#{{ c }};" ng-click="selectColor(c)" ng-class="{'selected': (c == newBoard.color) }"><br /></div>
+					<div class="color" ng-repeat="c in colors" style="background-color:#{{ c }};" ng-click="selectColor(c)" ng-class="{'selected': (c == newBoard.color)', dark': (newBoard.color | textColorFilter) === '#ffffff' }"><br /></div>
 				</div>
 			</form>
 		</div>
diff --git a/tests/unit/Db/BoardTest.php b/tests/unit/Db/BoardTest.php
index 7cbb11d50..3874003d5 100644
--- a/tests/unit/Db/BoardTest.php
+++ b/tests/unit/Db/BoardTest.php
@@ -21,6 +21,8 @@ class BoardTest extends \PHPUnit_Framework_TestCase {
 			'owner' => "admin",
 			'color' => "000000",
 			'labels' => array(),
+			'permissions' => [],
+			'deletedAt' => 0,
 			'acl' => array(),
 			'archived' => false
 		], $board->jsonSerialize());
@@ -35,6 +37,8 @@ class BoardTest extends \PHPUnit_Framework_TestCase {
 			'owner' => "admin",
 			'color' => "000000",
 			'labels' => array("foo", "bar"),
+			'permissions' => [],
+			'deletedAt' => 0,
 			'acl' => array(),
 			'archived' => false
 		], $board->jsonSerialize());
@@ -56,6 +60,8 @@ class BoardTest extends \PHPUnit_Framework_TestCase {
 			'owner' => "admin",
 			'color' => "000000",
 			'labels' => array(),
+			'permissions' => [],
+			'deletedAt' => 0,
 			'acl' => array(),
 			'archived' => false,
 			'shared' => 1,
diff --git a/tests/unit/Service/BoardServiceTest.php b/tests/unit/Service/BoardServiceTest.php
index 7ff2ed004..86922344c 100644
--- a/tests/unit/Service/BoardServiceTest.php
+++ b/tests/unit/Service/BoardServiceTest.php
@@ -148,10 +148,7 @@ class BoardServiceTest extends \Test\TestCase {
 		$this->boardMapper->expects($this->once())
 			->method('find')
 			->willReturn($board);
-		$this->boardMapper->expects($this->once())
-			->method('delete')
-			->willReturn(1);
-		$this->assertEquals(1, $this->service->delete(123));
+		$this->assertEquals($board, $this->service->delete(123));
 	}
 
 	public function testAddAcl() {