diff --git a/css/style.css b/css/style.css
index 638110c02..b7b87a66a 100644
--- a/css/style.css
+++ b/css/style.css
@@ -577,8 +577,16 @@
 .colorselect .selected {
 	opacity: 1.0;
 	border: 1px solid #333333;
-	width: 27px;
-	height: 27px;
+}
+
+.labels .colorselect {
+	padding: 0;
+	clear: none;
+	overflow: visible;
+}
+.labels .colorselect .color {
+	width:26px;
+	height:26px;
 }
 
 #boardlist {
diff --git a/js/controller/BoardController.js b/js/controller/BoardController.js
index 16e97b7ae..f0d50fcf3 100644
--- a/js/controller/BoardController.js
+++ b/js/controller/BoardController.js
@@ -25,7 +25,9 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
 	$scope.sidebar = $rootScope.sidebar;
 
 	$scope.id = $stateParams.boardId;
-	$scope.status = {};
+	$scope.status = {
+		addCard: [],
+	};
 	$scope.newLabel = {};
 	$scope.status.boardtab = $stateParams.detailTab;
 
@@ -79,7 +81,6 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
 	};
 	$scope.checkCanEdit = function () {
 		return !$scope.archived;
-
 	};
 
 	// filter cards here, as ng-sortable will not work nicely with html-inline filters
@@ -117,7 +118,6 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
 		$scope.statusservice.setError('Error occured', error);
 	});
 
-
 	BoardService.searchUsers('%25');
 
 	$scope.searchForUser = function (search) {
@@ -144,7 +144,6 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
 			'type': 'plain'
 		};
 		CardService.create(newCard).then(function (data) {
-			// FIXME: called here reorders
 			$scope.stackservice.addCard(data);
 			$scope.newCard.title = "";
 		});
diff --git a/js/public/app.js b/js/public/app.js
index 2761ffbc7..fa2319481 100644
--- a/js/public/app.js
+++ b/js/public/app.js
@@ -119,7 +119,9 @@ app.controller('BoardController', ["$rootScope", "$scope", "$stateParams", "Stat
 	$scope.sidebar = $rootScope.sidebar;
 
 	$scope.id = $stateParams.boardId;
-	$scope.status = {};
+	$scope.status = {
+		addCard: [],
+	};
 	$scope.newLabel = {};
 	$scope.status.boardtab = $stateParams.detailTab;
 
@@ -173,7 +175,6 @@ app.controller('BoardController', ["$rootScope", "$scope", "$stateParams", "Stat
 	};
 	$scope.checkCanEdit = function () {
 		return !$scope.archived;
-
 	};
 
 	// filter cards here, as ng-sortable will not work nicely with html-inline filters
@@ -211,7 +212,6 @@ app.controller('BoardController', ["$rootScope", "$scope", "$stateParams", "Stat
 		$scope.statusservice.setError('Error occured', error);
 	});
 
-
 	BoardService.searchUsers('%25');
 
 	$scope.searchForUser = function (search) {
@@ -238,7 +238,6 @@ app.controller('BoardController', ["$rootScope", "$scope", "$stateParams", "Stat
 			'type': 'plain'
 		};
 		CardService.create(newCard).then(function (data) {
-			// FIXME: called here reorders
 			$scope.stackservice.addCard(data);
 			$scope.newCard.title = "";
 		});
diff --git a/lib/CardArchivedException.php b/lib/CardArchivedException.php
index 06d3b92d8..b5f13ef84 100644
--- a/lib/CardArchivedException.php
+++ b/lib/CardArchivedException.php
@@ -21,7 +21,7 @@
  *  
  */
 
-namespace OCA\Deck\Service;
+namespace OCA\Deck;
 
 class CardArchivedException extends \Exception {
 	/**
diff --git a/lib/Service/CardService.php b/lib/Service/CardService.php
index 97a3eb6d3..40cbc06af 100644
--- a/lib/Service/CardService.php
+++ b/lib/Service/CardService.php
@@ -28,6 +28,7 @@ namespace OCA\Deck\Service;
 
 use \OCA\Deck\Db\Card;
 use \OCA\Deck\Db\CardMapper;
+use \OCA\Deck\CardArchivedException;
 
 
 class CardService  {
diff --git a/templates/part.board.mainView.php b/templates/part.board.mainView.php
index 998c09e39..b791793f4 100644
--- a/templates/part.board.mainView.php
+++ b/templates/part.board.mainView.php
@@ -100,13 +100,14 @@
 			<div class="card create"
 				 style="background-color:#{{ boardservice.getCurrent().color }};" ng-if="checkCanEdit() && filter!=='archive'">
 				<form ng-submit="createCard(s.id, newCard.title)">
-					<h3 ng-if="s.status.addCard">
+					<h3 ng-if="status.addCard[s.id]">
 						<input type="text" autofocus-on-insert
 							   ng-model="newCard.title"
-							   ng-blur="s.status.addCard=false" required/>
+							   ng-blur="status.addCard[s.id]=false"
+							    required/>
 					</h3>
 				</form>
-				<div ng-if="!s.status.addCard" ng-click="s.status.addCard=!s.status.addCard">
+				<div ng-if="!status.addCard[s.id]" ng-click="status.addCard[s.id]=true">
 					<i class="icon icon-add{{ boardservice.getCurrent().color | iconWhiteFilter }}"></i>
 				</div>
 			</div>