diff --git a/html/serverInfo.html b/html/serverInfo.html
index 9c3a95a..d161e31 100644
--- a/html/serverInfo.html
+++ b/html/serverInfo.html
@@ -3,15 +3,20 @@
 
 	<div class="row">
 
-		<div class="col-lg-12">
+		<div class="col-sm-12">
 			<h2 class="center">
 				{{info.Hostname}}
 				<div class="btn-group pull-right">
-					<button ng-click="Refresh()" class="btn btn-default" type="button"><i class="glyphicon glyphicon-refresh"></i></button>
+					<button ng-click="refresh()" class="btn btn-default" type="button"><i class="glyphicon glyphicon-refresh"></i></button>
 				</div>
 			</h2>
 		</div>
 
+		<div class="col-sm-4" ng-repeat="(key, value) in info">
+			<p>{{key}}: <span class="badge">{{value}}</span></p>
+		</div>
+
+		<!--
 		<div class="col-sm-4">
 			<p>Map: {{info.Map}}</p>
 		</div>
@@ -48,6 +53,8 @@
 			<p>Queued: <span class="badge">{{info.Queued}}</span></p>
 		</div>
 
+		-->
+
 	</div>
 
 </div>
diff --git a/js/serverInfo.js b/js/serverInfo.js
index afe5143..07b9489 100644
--- a/js/serverInfo.js
+++ b/js/serverInfo.js
@@ -5,16 +5,12 @@ function ServerInfoController( $scope, rconService, $routeParams )
 {
 	$scope.info = {};
 
-	$scope.Refresh = function ()
+	$scope.refresh = function ()
 	{
-		rconService.Request( 'serverinfo', $scope, function ( msg )
-		{
+		rconService.Request( 'serverinfo', $scope, function ( msg ) {
 			$scope.info = JSON.parse( msg.Message );
-			// $scope.Players = JSON.parse( msg.Message );
-
-			console.log($scope.info);
 		});
 	}
 
-	rconService.InstallService( $scope, $scope.Refresh );
+	rconService.InstallService( $scope, $scope.refresh );
 }