diff --git a/css/style.scss b/css/style.scss
index e228b4136..93a97ca81 100644
--- a/css/style.scss
+++ b/css/style.scss
@@ -190,6 +190,10 @@ input.input-inline {
 	.crumb {
 		order: 0;
 
+		.bullet {
+			opacity: 1;
+		}
+
 		a:nth-child(2),
 		a:nth-child(3) {
 			padding-left: 0;
diff --git a/js/controller/BoardController.js b/js/controller/BoardController.js
index b13ee3b80..01990f108 100644
--- a/js/controller/BoardController.js
+++ b/js/controller/BoardController.js
@@ -55,7 +55,11 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
 	};
 
 	$scope.$watch(function () {
-		return BoardService.getCurrent().title;
+		if (typeof BoardService.getCurrent() !== 'undefined') {
+			return BoardService.getCurrent().title;
+		} else {
+			return null;
+		}
 	}, function () {
 		$scope.setPageTitle();
 	});
@@ -211,6 +215,9 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
 	};
 
 	$scope.aclTypeString = function (acl) {
+		if (typeof acl === 'undefined') {
+			return '';
+		}
 		switch (acl.type) {
 			case OC.Share.SHARE_TYPE_USER:
 				return 'user';
diff --git a/js/controller/CardController.js b/js/controller/CardController.js
index f4815f517..4556b5b08 100644
--- a/js/controller/CardController.js
+++ b/js/controller/CardController.js
@@ -58,6 +58,7 @@ app.controller('CardController', function ($scope, $rootScope, $routeParams, $lo
 			return false;
 		}
 		$scope.status.cardEditDescription = true;
+		$scope.status.edit = angular.copy(CardService.getCurrent());
 		return true;
 	};
 	$scope.cardEditDescriptionChanged = function ($event) {
@@ -73,7 +74,7 @@ app.controller('CardController', function ($scope, $rootScope, $routeParams, $lo
 			$scope.status.lastSave = currentTime;
 			var header = $('.section-header.card-description');
 			header.find('.save-indicator.unsaved').fadeIn(500);
-			CardService.update(CardService.getCurrent()).then(function (data) {
+			CardService.update($scope.status.edit).then(function (data) {
 				var header = $('.section-header.card-description');
 				header.find('.save-indicator.unsaved').hide();
 				header.find('.save-indicator.saved').fadeIn(250).fadeOut(1000);
@@ -89,7 +90,7 @@ app.controller('CardController', function ($scope, $rootScope, $routeParams, $lo
 		});
 	};
 	$scope.cardUpdate = function (card) {
-		CardService.update(CardService.getCurrent()).then(function (data) {
+		CardService.update(card).then(function (data) {
 			$scope.status.cardEditDescription = false;
 			var header = $('.section-content.card-description');
 			header.find('.save-indicator.unsaved').hide();
diff --git a/templates/part.board.mainView.php b/templates/part.board.mainView.php
index 823527d11..f1184f43a 100644
--- a/templates/part.board.mainView.php
+++ b/templates/part.board.mainView.php
@@ -14,7 +14,7 @@
 		<a ui-sref="list({ filter: 'archived' })"><?php p($l->t('Archived boards')); ?></a>
 	</div>
 	<div class="crumb title">
-		<a><span class="board-bullet" ng-style="{'background-color':'#' + boardservice.getCurrent().color}"></span></a>
+		<a class="bullet"><span class="board-bullet" ng-style="{'background-color':'#' + boardservice.getCurrent().color}"></span></a>
 		<a ui-sref=".({filter: ''})">{{ boardservice.getCurrent().title }}</a>
 		<a ui-sref=".detail({ tab: 0 })"><span class="icon icon-share"></span></a>
 	</div>
diff --git a/templates/part.boardlist.php b/templates/part.boardlist.php
index 3047d0c36..0c7d3fff2 100644
--- a/templates/part.boardlist.php
+++ b/templates/part.boardlist.php
@@ -32,7 +32,7 @@
 				<div ng-click="gotoBoard(b)" ng-show="!b.status.edit">{{ b.title }}</div>
 				<div class="app-navigation-entry-edit" ng-show="b.status.edit">
 					<form ng-disabled="isAddingList" class="ng-pristine ng-valid" ng-submit="boardUpdate(b)">
-						<input id="newTitle" class="edit ng-valid ng-empty" type="text" autofocus-on-insert ng-model="b.title" maxlength="100" ng-model-options="{ debounce: 250 }">
+						<input class="edit ng-valid ng-empty" type="text" autofocus-on-insert ng-model="b.title" maxlength="100" ng-model-options="{ debounce: 250 }">
 						<div class="colorselect">
 							<div class="color" ng-repeat="c in ::colors" ng-style="{'background-color':'#{{ c }}'}" ng-click="b.color=c" ng-class="{'selected': (c == b.color) }"><br /></div>
 						</div>
@@ -99,7 +99,7 @@
 			<td>
 				<form ng-disabled="isAddingList"
 					  class="ng-pristine ng-valid" ng-submit="boardCreate()">
-					<input id="newTitle" class="edit ng-valid ng-empty"
+					<input 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" ng-model-options="{ debounce: 250 }">
 					<div class="colorselect">
diff --git a/templates/part.card.php b/templates/part.card.php
index 9931c1248..eaf9258be 100644
--- a/templates/part.card.php
+++ b/templates/part.card.php
@@ -98,8 +98,8 @@
 	<div class="section-content card-description">
 		<textarea elastic ng-if="status.cardEditDescription"
 				  placeholder="<?php p($l->t('Add a card description…')); ?>"
-				  ng-blur="cardUpdate(cardservice.getCurrent())"
-				  ng-model="cardservice.getCurrent().description"
+				  ng-blur="cardUpdate(status.edit)"
+				  ng-model="status.edit.description"
 				  ng-change="cardEditDescriptionChanged()"
 				  autofocus-on-insert> </textarea>
 		<div class="container" ng-click="cardEditDescriptionShow($event)"
diff --git a/templates/part.navigation.php b/templates/part.navigation.php
index 9e207d0c7..60611add2 100644
--- a/templates/part.navigation.php
+++ b/templates/part.navigation.php
@@ -35,7 +35,7 @@
 
 		<div class="app-navigation-entry-edit">
 			<form ng-disabled="isAddingList" class="ng-pristine ng-valid"  ng-submit="boardUpdate(b)">
-				<input id="newTitle" class="edit ng-valid ng-empty" type="text" autofocus-on-insert ng-model="b.title" maxlength="100" ng-model-options="{ debounce: 250 }">
+				<input class="edit ng-valid ng-empty" type="text" autofocus-on-insert ng-model="b.title" maxlength="100" ng-model-options="{ debounce: 250 }">
 				<input type="submit" value="" class="action icon-checkmark svg">
 			</form>
 			<div class="colorselect">
@@ -50,7 +50,7 @@
 		</a>
 		<div class="app-navigation-entry-edit" ng-if="status.addBoard">
 			<form ng-disabled="isAddingList" class="ng-pristine ng-valid"  ng-submit="boardCreate()">
-				<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" ng-model-options="{ debounce: 250 }">
+				<input 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" ng-model-options="{ debounce: 250 }">
 				<input type="submit" value="" class="action icon-checkmark svg">
 			</form>
 			<div class="colorselect">