diff --git a/src/main/webapp/public/scripts/services/services.js b/src/main/webapp/public/scripts/services/services.js
index 3b787bb33d1..79aa80bba92 100644
--- a/src/main/webapp/public/scripts/services/services.js
+++ b/src/main/webapp/public/scripts/services/services.js
@@ -71,7 +71,7 @@ angular.module('springBootAdmin.services', ['ngResource'])
   	.service('ApplicationDetails', ['$http', function($http) {
   		this.getInfo = function(app) {
   			return $http.get(app.url + '/info').success(function(response) {
-  				app.info = angular.toJson(response, true);
+  				app.info = response;
   			});
   		}
   		this.getMetrics = function(app) {
@@ -82,8 +82,6 @@ angular.module('springBootAdmin.services', ['ngResource'])
   		this.getEnv = function(app) {
   			return $http.get(app.url + '/env').success(function(response) {
   				app.env = response;
-  				app.env.systemProp = angular.toJson(app.env['systemProperties'], true);
-  				app.env.systemEnv = angular.toJson(app.env['systemEnvironment'], true);
   			});
   		}
   		this.getProps = function(app) {
@@ -93,7 +91,7 @@ angular.module('springBootAdmin.services', ['ngResource'])
   					if (attr.indexOf('[') != -1 && attr.indexOf('.properties]') != -1) {
   						var prop = new Object();
   						prop.key = attr;
-  						prop.value = angular.toJson(response[attr], true);
+  						prop.value = response[attr];
   						app.props.push(prop);
   					}
   				}
diff --git a/src/main/webapp/public/views/apps/details/env.html b/src/main/webapp/public/views/apps/details/env.html
index 71b07fdce7d..a9c723e69f1 100644
--- a/src/main/webapp/public/views/apps/details/env.html
+++ b/src/main/webapp/public/views/apps/details/env.html
@@ -1,16 +1,21 @@
 <table class="table table-striped">
 	<thead>
 		<tr>
-			<th>Profiles</th>
-			<th width="400">System Properties</th>
-			<th width="400">System Environment</th>
+			<th>Environment</th>
+			<th width="400">Key</th>
+			<th width="400">Value</th>
 		</tr>
 	</thead>
 	<tbody>
-		<tr>
-			<td>{{ application.env.profiles }}</td>
-			<td style="word-break: break-all; ">{{ application.env.systemProp }}</td>
-			<td style="word-break: break-all; ">{{ application.env.systemEnv }}</td>
+		<tr ng-repeat-start="(envkey, envvalue) in application.env">
+			<td style="background-color: #6DB33F; font-weight:bold;" colspan="3">{{envkey}}</td>
+		</tr>
+	
+		<tr ng-repeat-end ng-repeat="(propkey, propvalue) in envvalue" >
+				<td>&nbsp</td>
+				<td>{{propkey}}</td>
+				<td>{{propvalue}}</td>
 		</tr>
+			
 	</tbody>
 </table>
diff --git a/src/main/webapp/public/views/apps/details/infos.html b/src/main/webapp/public/views/apps/details/infos.html
index c4c8dcb104c..e55d907b8d4 100644
--- a/src/main/webapp/public/views/apps/details/infos.html
+++ b/src/main/webapp/public/views/apps/details/infos.html
@@ -1,14 +1,21 @@
 <table class="table table-striped">
 	<thead>
 		<tr>
-			<th>Info JSON</th>
+			<th colspan="3">Info JSON</th>
 		</tr>
 	</thead>
 	<tbody>
-		<tr>
-			<td>
-				{{ application.info }}
-			</td>
+	
+		<tr ng-repeat-start="(infokey, infovalue) in application.info">
+			<td style="background-color: #6DB33F; font-weight:bold;" colspan="3">{{infokey}}</td>
+		</tr>
+	
+		<tr ng-repeat-end ng-repeat="(propkey, propvalue) in infovalue" >
+				<td>&nbsp</td>
+				<td>{{propkey}}</td>
+				<td>{{propvalue}}</td>
 		</tr>
+		
+		
 	</tbody>
 </table>
diff --git a/src/main/webapp/public/views/apps/details/props.html b/src/main/webapp/public/views/apps/details/props.html
index 635f693600f..13a03ad3566 100644
--- a/src/main/webapp/public/views/apps/details/props.html
+++ b/src/main/webapp/public/views/apps/details/props.html
@@ -2,13 +2,19 @@
 	<thead>
 		<tr>
 			<th>Resource</th>
-			<th>Properties</th>
+			<th>Property-Key</th>
+			<th>Property-Value</th>
 		</tr>
 	</thead>
 	<tbody>
-		<tr ng-repeat="prop in application.props">
-			<td>{{ prop.key }}</td>
-			<td style="word-break: normal; ">{{ prop.value }}</td>
+		<tr ng-repeat-start="prop in application.props">
+			<td style="background-color: #6DB33F; font-weight:bold;" colspan="3">{{ prop.key }}</td>
 		</tr>
+		<tr ng-repeat-end ng-repeat="(propkey, propvalue) in prop.value" >
+				<td>&nbsp</td>
+				<td>{{propkey}}</td>
+				<td>{{propvalue}}</td>
+		</tr>
+		
 	</tbody>
 </table>