diff --git a/include/views/default/cockpit2/frontend/customers/customers-customer.phtml b/include/views/default/cockpit2/frontend/customers/customers-customer.phtml
index 2a87ffb97..f2eb0d33d 100644
--- a/include/views/default/cockpit2/frontend/customers/customers-customer.phtml
+++ b/include/views/default/cockpit2/frontend/customers/customers-customer.phtml
@@ -35,10 +35,6 @@
 							<div class="field-key">Address</div>
 							<div class="field-value"><a href ng-click="routeAddress(customer.address)">{{customer.address}}</a></div>
 						</div>
-						<div class="field-row">
-							<div class="field-key">Distance from restaurant</div>
-							<div class="field-value">@todo</div>
-						</div>
 					</div>
 				</div>
 			</div>
diff --git a/include/views/default/cockpit2/frontend/orders/orders-list.phtml b/include/views/default/cockpit2/frontend/orders/orders.phtml
similarity index 100%
rename from include/views/default/cockpit2/frontend/orders/orders-list.phtml
rename to include/views/default/cockpit2/frontend/orders/orders.phtml
diff --git a/include/views/default/cockpit2/frontend/staff/staff-list.phtml b/include/views/default/cockpit2/frontend/staff/staff.phtml
similarity index 100%
rename from include/views/default/cockpit2/frontend/staff/staff-list.phtml
rename to include/views/default/cockpit2/frontend/staff/staff.phtml
diff --git a/www/assets/cockpit/js/controllers.order.js b/www/assets/cockpit/js/controllers.order.js
index b6ccf4003..407c2eafa 100644
--- a/www/assets/cockpit/js/controllers.order.js
+++ b/www/assets/cockpit/js/controllers.order.js
@@ -3,7 +3,7 @@ NGApp.config(['$routeProvider', function($routeProvider) {
 		.when('/orders', {
 			action: 'orders',
 			controller: 'OrdersCtrl',
-			templateUrl: 'assets/view/orders-list.html',
+			templateUrl: 'assets/view/orders.html',
 			reloadOnSearch: false
 
 		}).when('/order/:id', {
diff --git a/www/assets/cockpit/js/controllers.staff.js b/www/assets/cockpit/js/controllers.staff.js
index 3ee7534f4..818352139 100644
--- a/www/assets/cockpit/js/controllers.staff.js
+++ b/www/assets/cockpit/js/controllers.staff.js
@@ -3,7 +3,7 @@ NGApp.config(['$routeProvider', function($routeProvider) {
 		.when('/staff', {
 			action: 'staff',
 			controller: 'StaffCtrl',
-			templateUrl: 'assets/view/staff-list.html',
+			templateUrl: 'assets/view/staff.html',
 			reloadOnSearch: false
 		})
 		.when('/staff/:id', {