diff --git a/public/app/node.jade b/public/app/node.jade
index ce8a0e4..8bd2724 100644
--- a/public/app/node.jade
+++ b/public/app/node.jade
@@ -21,5 +21,6 @@
 			span.glyphicon.glyphicon-floppy-disk(aria-hidden="true")
 			| Save
 		span.btn.btn-default(ng-click="gps()")
+			span.glyphicon.glyphicon-screenshot(ng-if="loadingGPS")
 			span.glyphicon.glyphicon-map-marker(aria-hidden="true")
 			| GPS
diff --git a/public/app/node.js b/public/app/node.js
index 3112a0c..e76beb8 100644
--- a/public/app/node.js
+++ b/public/app/node.js
@@ -3,6 +3,7 @@
 angular.module('ffhb')
 	.controller('NodeCtrl',function($stateParams,$scope,store,config,leafletData){
 		$scope.nodeid = $stateParams.nodeid;
+		$scope.loadingGPS = false;
 		$scope.node = {};
 		angular.extend($scope, {
 			center: config.map.view,
@@ -50,6 +51,7 @@ angular.module('ffhb')
 			}
 		});
 		var setToGps = function(position){
+			$scope.loadingGPS = false;
 			var pos = [position.coords.latitude,position.coords.longitude];
 			if($scope.node !== undefined && $scope.node.nodeinfo !== undefined){
 				$scope.node.nodeinfo.location = {
@@ -67,6 +69,7 @@ angular.module('ffhb')
 		$scope.gps = function() {
 			if (navigator.geolocation) {
 				navigator.geolocation.getCurrentPosition(setToGps);
+				$scope.loadingGPS = true;
 			}else{
 				window.alert('No Permission for location');
 			}
diff --git a/public/app/nodes/nodesGroup.js b/public/app/nodes/nodesGroup.js
index ff99812..c719af7 100644
--- a/public/app/nodes/nodesGroup.js
+++ b/public/app/nodes/nodesGroup.js
@@ -3,10 +3,10 @@
 angular.module('ffhb')
 	.controller('NodesGroupCtrl',function(NgTableParams,$scope,store){
 		$scope.tableParams = new NgTableParams({
-			sorting: { hostname: 'asc' },
+			sorting: { 'nodeinfo.hostname': 'asc' },
 			group: 'nodeinfo.owner.contact',
 			total: 0,
-			count: 50
+			count: 100
 		}, {
 			dataset: []
 		});
diff --git a/public/app/nodes/nodesSort.js b/public/app/nodes/nodesSort.js
index 40dc3ea..3d738f0 100644
--- a/public/app/nodes/nodesSort.js
+++ b/public/app/nodes/nodesSort.js
@@ -3,9 +3,9 @@
 angular.module('ffhb')
 	.controller('NodesSortCtrl',function(NgTableParams,$scope,store){
 		$scope.tableParams = new NgTableParams({
-			sorting: { hostname: 'asc' },
+			sorting: { 'nodeinfo.hostname': 'asc' },
 			total: 0,
-			count: 50
+			count: 100
 		}, {
 			dataset: []
 		});
diff --git a/public/components/config.js b/public/components/config.js
index 7ce4678..c5dd0e3 100644
--- a/public/components/config.js
+++ b/public/components/config.js
@@ -36,7 +36,7 @@ angular.module('config', [])
 					}
 				}
 			},
-			geojson: 'https://meshviewer.breminale.ffhb.de/data/meshviewer.geojson',
-			refresh: 60000
+			geojson: 'https://mgmt.ffhb.de/meshviewer.geojson',
+			refresh: false
 		};
 	});