diff --git a/assets/js/app/upstreams/01_upstreams.js b/assets/js/app/upstreams/01_upstreams.js
index bb4a91168..bbc5a7837 100644
--- a/assets/js/app/upstreams/01_upstreams.js
+++ b/assets/js/app/upstreams/01_upstreams.js
@@ -28,7 +28,7 @@
                             }
                         }
                     })
-                    .state('upstreams.edit', {
+                    .state('upstreams.read', {
                         url: '/:id',
                         data : {
                             pageName : "Edit Upstream",
@@ -41,15 +41,15 @@
                                 templateUrl : 'js/app/upstreams/edit.html',
                                 controller: 'EditUpstreamController',
                             },
-                            'details@upstreams.edit': {
+                            'details@upstreams.read': {
                                 templateUrl: 'js/app/upstreams/edit-details.html',
                                 controller:'EditUpstreamDetailsController',
                             },
-                            'targets@upstreams.edit': {
+                            'targets@upstreams.read': {
                                 templateUrl: 'js/app/upstreams/targets/targets.html',
                                 controller: 'EditUpstreamTargetsController',
                             },
-                            'alerts@upstreams.edit': {
+                            'alerts@upstreams.read': {
                                 templateUrl: 'js/app/upstreams/alerts/alerts.html',
                                 controller: 'EditUpstreamAlertsController',
                             },
diff --git a/assets/js/app/upstreams/edit-details.html b/assets/js/app/upstreams/edit-details.html
index fda2f93ae..b0762dc14 100644
--- a/assets/js/app/upstreams/edit-details.html
+++ b/assets/js/app/upstreams/edit-details.html
@@ -1,14 +1,18 @@
-<div class="panel panel-default">
-    <div class="panel-heading primary">
-        <div class="panel-title">
-            Details
-        </div>
-    </div>
-    <div class="panel-body">
-        <div class="alert alert-danger" data-ng-show="errors.message">
-            {{errors.message}}
-        </div>
-        <div ng-include="'js/app/upstreams/partials/upstream-form.html?r=' + Date.now()"
-             class=""></div>
-    </div>
+<div class="bg-light-grey padding margin-bottom">
+    <h4 class="clearfix">
+        <i class="mdi mdi-information-outline"></i>
+        Upstream details
+    </h4>
 </div>
+
+<div ng-if="!user.hasPermission('upstreams','edit')">
+    <div json-human="upstream" class="table-responsive"></div>
+</div>
+
+<form class="form-horizontal" (keydown.enter)="$event.preventDefault()" ng-if="user.hasPermission('upstreams','edit')">
+    <div class="alert alert-danger" data-ng-show="errors.message">
+        {{errors.message}}
+    </div>
+    <div data-ng-include="partial"></div>
+</form>
+
diff --git a/assets/js/app/upstreams/edit-upstream-details-controller.js b/assets/js/app/upstreams/edit-upstream-details-controller.js
index 13499325e..e124198e8 100644
--- a/assets/js/app/upstreams/edit-upstream-details-controller.js
+++ b/assets/js/app/upstreams/edit-upstream-details-controller.js
@@ -15,6 +15,7 @@
 
 
         $scope.context = 'update';
+        $scope.partial = 'js/app/upstreams/partials/upstream-form.html?r=' + Date.now();
 
         $scope.onTagInputKeyPress = function ($event) {
           if($event.keyCode === 13) {
diff --git a/assets/js/app/upstreams/edit.html b/assets/js/app/upstreams/edit.html
index 7638b472f..0235e4a3d 100644
--- a/assets/js/app/upstreams/edit.html
+++ b/assets/js/app/upstreams/edit.html
@@ -1,11 +1,6 @@
 <div class="row">
     <div class="col-md-3">
         <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="panel-title">
-                    Manage
-                </div>
-            </div>
             <div class="list-group">
                 <a
                         class="list-group-item clickable"
@@ -33,7 +28,7 @@ <h4>Loading data...</h4>
         </div>
         <div ng-if="upstream" data-ui-view="details" ng-show="activeSection == 0"></div>
         <div ng-if="upstream" data-ui-view="targets" ng-show="activeSection == 1"></div>
-        <div ng-if="upstream" data-ui-view="alerts" ng-show="activeSection == 2"></div>
+        <div ng-if="user.hasPermission('upstreams','edit')" data-ui-view="alerts" ng-show="activeSection == 2"></div>
     </div>
 </div>
 
diff --git a/assets/js/app/upstreams/index.html b/assets/js/app/upstreams/index.html
index 5f6505d0f..e078fbde6 100644
--- a/assets/js/app/upstreams/index.html
+++ b/assets/js/app/upstreams/index.html
@@ -53,7 +53,13 @@
                     <td>
                         <raw-view data-item="item"></raw-view>
                     </td>
-                    <td>{{item.name || "-"}}</td>
+                    <td>
+                        <p class="no-margin">
+                            <a class="clickable"
+                               data-ui-sref="upstreams.read({id:item.id})"><strong>{{item.name || "-"}}</strong></a>
+                        </p>
+                    </td>
+<!--                    <td>{{item.name || "-"}}</td>-->
                     <td>
                         <span class="badge badge-tag badge-success badge-inverse" ng-repeat="tag in item.tags">
                             <i class="mdi mdi-tag"></i>&nbsp;
@@ -62,8 +68,8 @@
                     </td>
                     <td>{{item.slots || "-"}}</td>
                     <td>{{moment(item.created_at * 1000).format("MMM DD YYYY @HH:mm")}}</td>
-                    <td ng-if="user.hasPermission('upstreams','edit')">
-                        <a class="btn clickable btn-primary btn-link" data-ui-sref="upstreams.edit({id:item.id})">
+                    <td>
+                        <a class="btn clickable btn-primary btn-link" data-ui-sref="upstreams.read({id:item.id})">
                             <i class="mdi mdi-information-outline"></i>
                             details
                         </a>
diff --git a/assets/js/app/upstreams/targets/targets.html b/assets/js/app/upstreams/targets/targets.html
index 9b1c43fab..ba8e601f7 100644
--- a/assets/js/app/upstreams/targets/targets.html
+++ b/assets/js/app/upstreams/targets/targets.html
@@ -1,14 +1,17 @@
-<div class="panel panel-default">
-    <div class="panel-heading primary">
-        <div class="panel-title pull-left">
+<div class="col-md-12 bg-light-grey padding margin-bottom">
+    <div class="col-md-6 text-left">
+        <h4>
             Targets
-        </div>
-        <button class="btn btn-sm btn-primary btn-link pull-right" data-ng-click="onAddTarget()">
+        </h4>
+    </div>
+    <div class="col-md-6 text-right" ng-if="user.hasPermission('upstreams','edit')">
+        <button class="btn btn-primary btn-flat" style="margin-top: 5px" ng-click="onAddTarget()">
             <i class="mdi mdi-plus"></i>
             Add target
         </button>
-        <div class="clearfix"></div>
     </div>
+</div>
+<div class="panel panel-default">
     <div class="panel-body">
         <p class="help-block">A target is an ip address/hostname with a port that identifies an instance of a backend service. Every upstream can have many targets, and the targets can be dynamically added and removed. So changes are effectuated on the fly.</p>
 
@@ -95,7 +98,7 @@
                         </button>
                     </td>
                     <td>
-                        <button type="button" ng-click="deleteItem($index,item)" class="btn btn-danger btn-link">
+                        <button ng-if="user.hasPermission('upstreams','delete')" type="button" ng-click="deleteItem($index,item)" class="btn btn-danger btn-link">
                             <i class="mdi mdi-delete"></i>
                             Delete
                         </button>
diff --git a/start.sh b/start.sh
index a6ed3d43c..5df77e15c 100755
--- a/start.sh
+++ b/start.sh
@@ -9,8 +9,7 @@ if [ $# -eq 0 ]
   else
     while getopts "c:a:u:" option
     do
-        case "${option}"
-            in
+        case "${option}" in
             c) COMMAND=${OPTARG};;
             a) ADAPTER=${OPTARG};;
             u) URI=${OPTARG};;