diff --git a/templates/main.php b/templates/main.php
index 41299b0f0..d68c08f16 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -42,7 +42,7 @@ Util::addScript('deck', 'public/app');
 
 	<div id="app-navigation" data-ng-controller="ListController">
 		<?php print_unescaped($this->inc('part.navigation')); ?>
-		<?php /* print_unescaped($this->inc('part.settings'));*/ ?>
+		<?php /* print_unescaped($this->inc('part.settings')); */ ?>
 	</div>
 	<div id="app-content" ng-class="{ 'details-visible': sidebar.show }">
 		<div id="app-view" ui-view></div>
@@ -53,7 +53,6 @@ Util::addScript('deck', 'public/app');
 	<script type="text/ng-template" id="/boardlist.mainView.html">
 		<?php print_unescaped($this->inc('part.boardlist')); ?>
 	</script>
-	<script type="text/ng-template" id="/boardlist.sidebarView.html"></script>
 	<script type="text/ng-template" id="/board.sidebarView.html">
 		<?php print_unescaped($this->inc('part.board.sidebarView')); ?>
 	</script>
diff --git a/templates/part.navigation.php b/templates/part.navigation.php
index 0e1efa11c..40b21db61 100644
--- a/templates/part.navigation.php
+++ b/templates/part.navigation.php
@@ -1,11 +1,6 @@
 <ul class="with-icon">
 
 	<li><a href="#" class=""><?php p($l->t('All Boards')); ?></a></li>
-	<!--
-	<li><a href="#" class="icon-starred">Starred Boards</a></li>
-	<li><a href="#" class="icon-share">Shared Boards</a></li>
-	<li><a href="#" class="icon-public">Public Boards</a></li>
-	//-->
 
 	<li class="with-icon with-menu" data-ng-repeat="b in boardservice.sorted">
 		<span class="board-bullet"  style="background-color:#{{b.color}};" ng-if="!b.status.edit"> </span>
@@ -18,7 +13,10 @@
 		</div>
 		<div class="app-navigation-entry-menu app-navigation-noclose" ng-show="!b.status.edit">
 			<ul>
-				<li><button class="icon-share svg" title="share"></button></li>
+				<!--
+					TODO: Link to board sharing details
+					<li><button class="icon-share svg" title="share"></button></li>
+				//-->
 				<li><button class="icon-rename svg" title="rename" ng-click="b.status.edit=true"></button></li>
 				<li><button class="icon-delete svg" title="delete" ng-click="boardDelete(b)"></button></li>
 			</ul>
@@ -53,4 +51,5 @@
 			</form>
 		</div>
 	</li>
+
 </ul>
diff --git a/templates/part.settings.php b/templates/part.settings.php
index 411eb1cbf..b86b4f3ef 100644
--- a/templates/part.settings.php
+++ b/templates/part.settings.php
@@ -1,11 +1,8 @@
 <div id="app-settings">
 	<div id="app-settings-header">
-		<button class="settings-button"
-				data-apps-slide-toggle="#app-settings-content"
-		></button>
+		<button class="settings-button" data-apps-slide-toggle="#app-settings-content"></button>
+	</div>
+	<div id="app-settings-content">
+
 	</div>
-	<!--<div id="app-settings-content">
-		<?php p($l->t('There will be some options here!')); ?>
-		<br />
-	</div>//-->
 </div>
diff --git a/templates/public.php b/templates/public.php
deleted file mode 100644
index e9a68ae7e..000000000
--- a/templates/public.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016 Julius Härtl <jus@bitgrid.net>
- *
- * @author Julius Härtl <jus@bitgrid.net>
- *
- * @license GNU AGPL version 3 or any later version
- *  
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *  
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *  
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *  
- */
-
-use OCP\Util;
-Util::addStyle('deck', 'font-awesome');
-Util::addStyle('deck', 'style');
-Util::addScript('deck', 'vendor/angular/angular.min');
-Util::addScript('deck', 'vendor/angular-route/angular-route.min');
-Util::addScript('deck', 'vendor/angular-sanitize/angular-sanitize.min');
-Util::addScript('deck', 'vendor/angular-animate/angular-animate.min');
-Util::addScript('deck', 'vendor/angular-ui-router/release/angular-ui-router.min');
-Util::addScript('deck', 'app/App');
-
-?>
-
-<div id="app" class="app-deck public-board" data-ng-app="Deck" ng-controller="AppController" ng-cloak">
-
-<div id="app-content" ng-class="{ 'details-visible': sidebar.show }">
-    <?php print_unescaped($this->inc('part.content')); ?>
-</div>
-
-<div id="app-sidebar" class="details-view scroll-container" ng-controller="CardController" ng-class="{ 'details-visible': sidebar.show }">
-    <?php print_unescaped($this->inc('part.card')); ?>
-</div>
-</div>