diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index a67240d6faf..a1e266eeefb 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -1,5 +1,9 @@
 #new labels (begin) **********************************************************************************************
-label.action.register.template=Register template
+label.virtual.routers=Virtual Routers
+label.primary.storage.count=Primary Storage Pools
+label.secondary.storage.count=Secondary Storage Pools
+label.number.of.system.vms=Number of System VMs
+label.number.of.virtual.routers=Number of Virtual Routers
 label.action.register.iso=Register ISO
 label.isolation.method=Isolation method
 #new labels (end) ************************************************************************************************
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 89c31e134ce..c5866eff531 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -3473,7 +3473,7 @@ Dialogs*/
   margin: 6px 9px 9px;
   padding: 9px;
   color: #FFFFFF;
-  /* Adjusting the font size for proper display */
+/*Adjusting the font size for proper display*/
   font-size: 10px;
   border-left: 1px solid #6A6A6A;
   border-right: 1px solid #6A6A6A;
@@ -5967,7 +5967,7 @@ label.error {
   width: 59px;
   height: 23px;
   padding: 2px 9px 0 12px;
-  background: url(../images/bg-gradients.png) 0px 53px;
+  background: url(../images/bg-gradients.png) 0px -1342px;
   border: 1px solid #C4C4C4;
   /*+border-radius:4px;*/
   -moz-border-radius: 4px;
@@ -7249,6 +7249,12 @@ div.panel.ui-dialog div.list-view div.fixed-header {
   font-weight: bold;
 }
 
+.system-dashboard.zone {
+  height: 609px;
+  background-position: 0px -1423px;
+  background-color: #FFFFFF;
+}
+
 .system-dashboard-view .toolbar {
   position: relative;
 }
@@ -7347,6 +7353,13 @@ div.panel.ui-dialog div.list-view div.fixed-header {
   float: left;
 }
 
+.system-dashboard.zone .status_box li {
+  margin-bottom: 120px;
+  height: 176px;
+  background-position: 0px -1005px;
+  background-color: #35404B;
+}
+
 .system-dashboard .status_box li span {
   color: #FFFFFF;
   /*+text-shadow:0px 1px 1px #000000;*/
@@ -7388,6 +7401,10 @@ div.panel.ui-dialog div.list-view div.fixed-header {
   text-shadow: 0px 1px 2px #000000;
 }
 
+.system-dashboard.zone .status_box li span.header {
+  font-size: 13px;
+}
+
 .system-dashboard .status_box li span.status {
   font-size: 27px;
   /*+placement:shift 13px 141px;*/
diff --git a/ui/images/bg-gradients.png b/ui/images/bg-gradients.png
index a3851a8781c..2ef74540bbf 100644
Binary files a/ui/images/bg-gradients.png and b/ui/images/bg-gradients.png differ
diff --git a/ui/index.jsp b/ui/index.jsp
index 8276ca04370..b05519ac75e 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -948,58 +948,70 @@
         </div>
 
         <!-- Zone dashboard -->
-        <div class="system-dashboard">
+        <div class="system-dashboard zone">
           <div class="head">
-            <span><fmt:message key="label.zones"/></span>
-            <div class="view-all zones" view-all-target="zones"><span><fmt:message key="label.view.all"/></span></div>
+            <span><fmt:message key="label.menu.infrastructure"/></span>
+            <div class="view-all zones"
+                 view-all-title="Zones"
+                 view-all-target="zones"><span><fmt:message key="label.view.all"/></span></div>
           </div>
           <ul class="status_box good">
             <li class="block">
-              <span class="header"><fmt:message key="label.number.of.zones"/></span>
+              <span class="header"><fmt:message key="label.zones"/></span>
               <span class="overview total" data-item="zoneCount"></span>
-              <span class="button view-all zones" view-all-target="zones"><fmt:message key="label.view.all"/></span>
+              <span class="button view-all zones"
+                    view-all-title="<fmt:message key="label.zones"/>"
+                    view-all-target="zones"><fmt:message key="label.view.all"/></span>
             </li>
             <li class="block">
-              <span class="header"><fmt:message key="label.number.of.pods"/></span>
+              <span class="header"><fmt:message key="label.pods"/></span>
               <span class="overview total" data-item="podCount"></span>
-              <span class="button view-all pods" view-all-target="pods"><fmt:message key="label.view.all"/></span>
+              <span class="button view-all pods"
+                    view-all-title="<fmt:message key="label.pods"/>"
+                    view-all-target="pods"><fmt:message key="label.view.all"/></span>
             </li>
             <li class="block">
-              <span class="header"><fmt:message key="label.number.of.clusters"/></span>
+              <span class="header"><fmt:message key="label.clusters"/></span>
               <span class="overview total" data-item="clusterCount"></span>
-              <span class="button view-all clusters" view-all-target="clusters"><fmt:message key="label.view.all"/></span>
+              <span class="button view-all clusters"
+                    view-all-title="<fmt:message key="label.clusters"/>"
+                    view-all-target="clusters"><fmt:message key="label.view.all"/></span>
             </li>
             <li class="block last">
-              <span class="header"><fmt:message key="label.number.of.hosts"/></span>
+              <span class="header"><fmt:message key="label.hosts"/></span>
               <span class="overview total" data-item="hostCount"></span>
-              <span class="button view-all hosts" view-all-target="hosts"><fmt:message key="label.view.all"/></span>
+              <span class="button view-all hosts"
+                    view-all-title="<fmt:message key="label.hosts"/>"
+                    view-all-target="hosts"><fmt:message key="label.view.all"/></span>
             </li>
-          </ul>
-        </div>
-
-        <!-- Host dashboard -->
-        <div class="system-dashboard">
-          <div class="head">
-            <span><fmt:message key="label.hosts"/></span>
-            <div class="view-more" view-all-target="hosts"><span><fmt:message key="label.view.all"/></span></div>
-          </div>
-          <ul class="status_box good">
             <li class="block">
-              <span class="header"><fmt:message key="label.total.hosts"/></span>
-              <span class="overview total" data-item="hostCount"></span>
+              <span class="header"><fmt:message key="label.primary.storage"/></span>
+              <span class="overview total" data-item="primaryStorageCount"></span>
+              <span class="button view-all zones"
+                    view-all-title="<fmt:message key="label.primary.storage"/>"
+                    view-all-target="primaryStorage"><fmt:message key="label.view.all"/></span>
             </li>
-            <li class="block capacity">
-              <span class="header"><fmt:message key="label.total.CPU"/></span>
-              <span class="overview total" data-item="cpuCapacityTotal"></span>
+            <li class="block">
+              <span class="header"><fmt:message key="label.secondary.storage"/></span>
+              <span class="overview total" data-item="secondaryStorageCount"></span>
+              <span class="button view-all pods"
+                    view-all-title="<fmt:message key="label.secondary.storage"/>"
+                    view-all-target="secondaryStorage"><fmt:message key="label.view.all"/></span>
             </li>
-            <li class="block capacity">
-              <span class="header"><fmt:message key="label.total.memory"/></span>
-              <span class="overview total" data-item="memCapacityTotal"></span>
-            </li>
-            <li class="block last capacity">
-              <span class="header"><fmt:message key="label.total.storage"/></span>
-              <span class="overview total" data-item="storageCapacityTotal"></span>
+            <li class="block">
+              <span class="header"><fmt:message key="label.system.vms"/></span>
+              <span class="overview total" data-item="systemVmCount"></span>
+              <span class="button view-all clusters"
+                    view-all-title="<fmt:message key="label.system.vms"/>"
+                    view-all-target="systemVms"><fmt:message key="label.view.all"/></span>
             </li>
+            <li class="block last">
+              <span class="header"><fmt:message key="label.virtual.routers"/></span>
+              <span class="overview total" data-item="virtualRouterCount"></span>
+              <span class="button view-all hosts"
+                    view-all-title="<fmt:message key="label.virtual.routers"/>"
+                    view-all-target="virtualRouters"><fmt:message key="label.view.all"/></span>
+            </li> 
           </ul>
         </div>
       </div>
@@ -1659,6 +1671,11 @@
 
 <script language="javascript">
 dictionary = {
+'label.virtual.routers': '<fmt:message key="label.virtual.routers"/>',
+'label.primary.storage.count': '<fmt:message key="label.primary.storage.count"/>',
+'label.secondary.storage.count': '<fmt:message key="label.secondary.storage.count"/>',
+'label.number.of.system.vms': '<fmt:message key="label.number.of.system.vms"/>',
+'label.number.of.virtual.routers': '<fmt:message key="label.number.of.virtual.routers"/>',
 'label.max.networks': '<fmt:message key="label.max.networks"/>',
 'label.latest.events': '<fmt:message key="label.latest.events"/>',
 'state.Enabled': '<fmt:message key="state.Enabled"/>',
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index f3b54ff0bca..f355059daa4 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -202,7 +202,7 @@
                 type: 'routing'
               },
               success: function(json) {
-                dataFns.capacity($.extend(data, {
+                dataFns.primaryStorageCount($.extend(data, {
                   hostCount: json.listhostsresponse.count ?
                     json.listhostsresponse.count : 0
                 }));
@@ -210,6 +210,60 @@
             });
           },
 
+          primaryStorageCount: function(data) {
+            $.ajax({
+              url: createURL('listStoragePools'),
+              success: function(json) {
+                dataFns.secondaryStorageCount($.extend(data, {
+                  primaryStorageCount: json.liststoragepoolsresponse.count ?
+                    json.liststoragepoolsresponse.count : 0
+                }));
+              }
+            });
+          },
+
+          secondaryStorageCount: function(data) {
+            $.ajax({
+              url: createURL('listHosts'),
+              data: {
+                type: 'SecondaryStorage'
+              },
+              success: function(json) {
+                dataFns.systemVmCount($.extend(data, {
+                  secondaryStorageCount: json.listhostsresponse.count ?
+                    json.listhostsresponse.count : 0
+                }));
+              }
+            });
+          },
+
+          systemVmCount: function(data) {
+            $.ajax({
+              url: createURL('listSystemVms'),
+              success: function(json) {
+                dataFns.virtualRouterCount($.extend(data, {
+                  systemVmCount: json.listsystemvmsresponse.count ?
+                    json.listsystemvmsresponse.count : 0
+                }));
+              }
+            });
+          },
+
+          virtualRouterCount: function(data) {
+            $.ajax({
+              url: createURL('listRouters'),
+              data: {
+                listAll: true
+              },
+              success: function(json) {
+                dataFns.capacity($.extend(data, {
+                  virtualRouterCount: json.listroutersresponse.count ?
+                    json.listroutersresponse.count : 0
+                }));
+              }
+            });
+          },
+
           capacity: function(data) {
             if (data.zoneCount) {
               $.ajax({
@@ -880,7 +934,7 @@
                       action: function(args) {
                         var array1 = [];
                         array1.push("&podid=" + args.data.podid);
-												array1.push("&networkid=" + selectedGuestNetworkObj.id)
+												array1.push("&networkid=" + selectedGuestNetworkObj.id);
                         array1.push("&gateway=" + args.data.gateway);
                         array1.push("&netmask=" + args.data.netmask);
                         array1.push("&startip=" + args.data.startip);
@@ -1836,7 +1890,7 @@
                     state: { label: 'label.state' },
                     physicalnetworkid: { label: 'label.physical.network.ID' },
                     destinationphysicalnetworkid: { label: 'label.destination.physical.network.id' },
-										supportedServices: { label: 'label.supported.services' },
+										supportedServices: { label: 'label.supported.services' }
                   }
                 ],
                 dataProvider: function(args) { 					 
@@ -3854,18 +3908,18 @@
                                 activeviewersessions: { label: 'label.active.sessions' }
                               }
                             ],
-                            dataProvider: function(args) {	
-															$.ajax({
-																url: createURL("listSystemVms&id=" + args.context.systemVMs[0].id),
-																dataType: "json",
-																async: true,
-																success: function(json) {																  															
-																	args.response.success({
-																		actionFilter: systemvmActionfilter,
-																		data: json.listsystemvmsresponse.systemvm[0]
-																	});
-																}
-															});															
+                            dataProvider: function(args) {
+                              $.ajax({
+                                url: createURL("listSystemVms&id=" + args.context.systemVMs[0].id),
+                                dataType: "json",
+                                async: true,
+                                success: function(json) {
+                                  args.response.success({
+                                    actionFilter: systemvmActionfilter,
+                                    data: json.listsystemvmsresponse.systemvm[0]
+                                  });
+                                }
+                              });
                             }
                           }
                         }
@@ -3878,9 +3932,12 @@
             pods: function() {
               var listView = $.extend(true, {}, cloudStack.sections.system.subsections.pods.listView, {
                 dataProvider: function (args) {
+                  var searchByArgs = args.filterBy.search.value.length ?
+                    '&name=' + args.filterBy.search.value : '';
+
                   $.ajax({
-                    url: createURL('listPods'),
-                    data: { listAll: true },
+                    url: createURL('listPods' + searchByArgs),
+                    data: { page: args.page, pageSize: pageSize, listAll: true },
                     success: function (json) {
                       args.response.success({ data: json.listpodsresponse.pod });
                     },
@@ -3917,9 +3974,12 @@
             clusters: function() {
               var listView = $.extend(true, {}, cloudStack.sections.system.subsections.clusters.listView, {
                 dataProvider: function (args) {
+                  var searchByArgs = args.filterBy.search.value.length ?
+                    '&name=' + args.filterBy.search.value : '';
+
                   $.ajax({
-                    url: createURL('listClusters'),
-                    data: { listAll: true },
+                    url: createURL('listClusters' + searchByArgs),
+                    data: { page: args.page, pageSize: pageSize, listAll: true },
                     success: function (json) {
                       args.response.success({ data: json.listclustersresponse.cluster });
                     },
@@ -3956,9 +4016,12 @@
             hosts: function() {
               var listView = $.extend(true, {}, cloudStack.sections.system.subsections.hosts.listView, {
                 dataProvider: function (args) {
+                  var searchByArgs = args.filterBy.search.value.length ?
+                    '&name=' + args.filterBy.search.value : '';
+
                   $.ajax({
-                    url: createURL('listHosts'),
-                    data: { type: 'routing', listAll: true },
+                    url: createURL('listHosts' + searchByArgs),
+                    data: { page: args.page, pageSize: pageSize, type: 'routing', listAll: true },
                     success: function (json) {
                       args.response.success({ data: json.listhostsresponse.host });
                     },
@@ -3990,6 +4053,174 @@
                 }
               });
 
+              return listView;
+            },
+            primaryStorage: function() {
+              var listView = $.extend(true, {}, cloudStack.sections.system.subsections['primary-storage'].listView, {
+                dataProvider: function (args) {
+                  var searchByArgs = args.filterBy.search.value.length ?
+                    '&name=' + args.filterBy.search.value : '';
+
+                  $.ajax({
+                    url: createURL('listStoragePools' + searchByArgs),
+                    data: { page: args.page, pageSize: pageSize, listAll: true },
+                    success: function (json) {
+                      args.response.success({ data: json.liststoragepoolsresponse.storagepool });
+                    },
+                    error: function (json) {
+                      args.response.error(parseXMLHttpResponse(json));
+                    }
+                  });
+                },
+
+                detailView: {
+                  updateContext: function (args) {
+                    var zone;
+
+                    $.ajax({
+                      url: createURL('listZones'),
+                      data: { id: args.context.primarystorages[0].zoneid },
+                      async: false,
+                      success: function (json) {
+                        zone = json.listzonesresponse.zone[0];
+                      }
+                    });
+
+                    selectedZoneObj = zone;
+
+                    return {
+                      zones: [zone]
+                    };
+                  }
+                }
+              });
+
+              return listView;
+            },
+            secondaryStorage: function() {
+              var listView = $.extend(true, {}, cloudStack.sections.system.subsections['secondary-storage'].listView, {
+                dataProvider: function (args) {
+                  var searchByArgs = args.filterBy.search.value.length ?
+                    '&name=' + args.filterBy.search.value : '';
+
+                  $.ajax({
+                    url: createURL('listHosts' + searchByArgs),
+                    data: { type: 'SecondaryStorage', page: args.page, pageSize: pageSize, listAll: true },
+                    success: function (json) {
+                      args.response.success({ data: json.listhostsresponse.host });
+                    },
+                    error: function (json) {
+                      args.response.error(parseXMLHttpResponse(json));
+                    }
+                  });
+                },
+
+                detailView: {
+                  updateContext: function (args) {
+                    var zone;
+
+                    $.ajax({
+                      url: createURL('listZones'),
+                      data: { id: args.context.secondarystorages[0].zoneid },
+                      async: false,
+                      success: function (json) {
+                        zone = json.listzonesresponse.zone[0];
+                      }
+                    });
+
+                    selectedZoneObj = zone;
+
+                    return {
+                      zones: [zone]
+                    };
+                  }
+                }
+              });
+
+              return listView;
+            },
+            systemVms: function() {
+              var listView = $.extend(true, {}, cloudStack.sections.system.subsections.systemVms.listView, {
+                dataProvider: function (args) {
+                  var searchByArgs = args.filterBy.search.value.length ?
+                    '&name=' + args.filterBy.search.value : '';
+
+                  $.ajax({
+                    url: createURL('listSystemVms' + searchByArgs),
+                    data: { page: args.page, pageSize: pageSize, listAll: true },
+                    success: function (json) {
+                      args.response.success({ data: json.listsystemvmsresponse.systemvm });
+                    },
+                    error: function (json) {
+                      args.response.error(parseXMLHttpResponse(json));
+                    }
+                  });
+                },
+
+                detailView: {
+                  updateContext: function (args) {
+                    var zone;
+
+                    $.ajax({
+                      url: createURL('listZones'),
+                      data: { id: args.context.systemVMs[0].zoneid },
+                      async: false,
+                      success: function (json) {
+                        zone = json.listzonesresponse.zone[0];
+                      }
+                    });
+
+                    selectedZoneObj = zone;
+
+                    return {
+                      zones: [zone]
+                    };
+                  }
+                }
+              });
+
+              return listView;
+            },
+            virtualRouters: function() {
+              var listView = $.extend(true, {}, cloudStack.sections.system.subsections.virtualRouters.listView, {
+                dataProvider: function (args) {
+                  var searchByArgs = args.filterBy.search.value.length ?
+                    '&name=' + args.filterBy.search.value : '';
+
+                  $.ajax({
+                    url: createURL('listRouters' + searchByArgs),
+                    data: { page: args.page, pageSize: pageSize, listAll: true },
+                    success: function (json) {
+                      args.response.success({ data: json.listroutersresponse.router });
+                    },
+                    error: function (json) {
+                      args.response.error(parseXMLHttpResponse(json));
+                    }
+                  });
+                },
+
+                detailView: {
+                  updateContext: function (args) {
+                    var zone;
+
+                    $.ajax({
+                      url: createURL('listZones'),
+                      data: { id: args.context.routers[0].zoneid },
+                      async: false,
+                      success: function (json) {
+                        zone = json.listzonesresponse.zone[0];
+                      }
+                    });
+
+                    selectedZoneObj = zone;
+
+                    return {
+                      zones: [zone]
+                    };
+                  }
+                }
+              });
+
               return listView;
             }
           }
@@ -3997,7 +4228,791 @@
       }
     }),
     subsections: {
-      // netscaler devices listView
+      virtualRouters: {
+        listView: {
+          label: 'label.virtual.appliances',
+          id: 'routers',
+          fields: {
+            name: { label: 'label.name' },
+            zonename: { label: 'label.zone' },
+            state: {
+              converter: function(str) {
+                // For localization
+                return str;
+              },
+              label: 'label.status',
+              indicator: {
+                'Running': 'on',
+                'Stopped': 'off',
+                'Error': 'off'
+              }
+            }
+          },
+          dataProvider: function(args) {
+            var array1 = [];
+            if(args.filterBy != null) {
+              if(args.filterBy.search != null && args.filterBy.search.by != null && args.filterBy.search.value != null) {
+                switch(args.filterBy.search.by) {
+                  case "name":
+                    if(args.filterBy.search.value.length > 0)
+                      array1.push("&keyword=" + args.filterBy.search.value);
+                    break;
+                }
+              }
+            }
+
+            $.ajax({
+              url: createURL("listRouters&zoneid=" + selectedZoneObj.id + "&listAll=true&page=" + args.page + "&pagesize=" + pageSize + array1.join("")),
+              dataType: 'json',
+              async: true,
+              success: function(json) {
+                var items = json.listroutersresponse.router;
+                args.response.success({
+                  actionFilter: routerActionfilter,
+                  data: items
+                });
+              }
+            });
+
+            // Get project routers
+            $.ajax({
+              url: createURL("listRouters&zoneid=" + selectedZoneObj.id + "&listAll=true&page=" + args.page + "&pagesize=" + pageSize + array1.join("") + "&projectid=-1"),
+              dataType: 'json',
+              async: true,
+              success: function(json) {
+                var items = json.listroutersresponse.router;
+                args.response.success({
+                  actionFilter: routerActionfilter,
+                  data: items
+                });
+              }
+            });
+          },
+          detailView: {
+            name: 'Virtual applicance details',
+            actions: {
+              start: {
+                label: 'label.action.start.router',
+                messages: {
+                  confirm: function(args) {
+                    return 'message.action.start.router';
+                  },
+                  notification: function(args) {
+                    return 'label.action.start.router';
+                  }
+                },
+                action: function(args) {
+                  $.ajax({
+                    url: createURL('startRouter&id=' + args.context.routers[0].id),
+                    dataType: 'json',
+                    async: true,
+                    success: function(json) {
+                      var jid = json.startrouterresponse.jobid;
+                      args.response.success({
+                        _custom: {
+                          jobId: jid,
+                          getUpdatedItem: function(json) {
+                            return json.queryasyncjobresultresponse.jobresult.domainrouter;
+                          },
+                          getActionFilter: function() {
+                            return routerActionfilter;
+                          }
+                        }
+                      });
+                    }
+                  });
+                },
+                notification: {
+                  poll: pollAsyncJobResult
+                }
+              },
+
+              stop: {
+                label: 'label.action.stop.router',
+                createForm: {
+                  title: 'label.action.stop.router',
+                  desc: 'message.action.stop.router',
+                  fields: {
+                    forced: {
+                      label: 'force.stop',
+                      isBoolean: true,
+                      isChecked: false
+                    }
+                  }
+                },
+                messages: {
+                  notification: function(args) {
+                    return 'label.action.stop.router';
+                  }
+                },
+                action: function(args) {
+                  var array1 = [];
+                  array1.push("&forced=" + (args.data.forced == "on"));
+                  $.ajax({
+                    url: createURL('stopRouter&id=' + args.context.routers[0].id + array1.join("")),
+                    dataType: 'json',
+                    async: true,
+                    success: function(json) {
+                      var jid = json.stoprouterresponse.jobid;
+                      args.response.success({
+                        _custom: {
+                          jobId: jid,
+                          getUpdatedItem: function(json) {
+                            return json.queryasyncjobresultresponse.jobresult.domainrouter;
+                          },
+                          getActionFilter: function() {
+                            return routerActionfilter;
+                          }
+                        }
+                      });
+                    }
+                  });
+                },
+                notification: {
+                  poll: pollAsyncJobResult
+                }
+              },
+
+              'remove': {
+                label: 'label.destroy.router',
+                messages: {
+                  confirm: function(args) {
+                    return 'message.confirm.destroy.router';
+                  },
+                  notification: function(args) {
+                    return 'label.destroy.router';
+                  }
+                },
+                action: function(args) {
+                  $.ajax({
+                    url: createURL("destroyRouter&id=" + args.context.routers[0].id),
+                    dataType: "json",
+                    async: true,
+                    success: function(json) {
+                      var jid = json.destroyrouterresponse.jobid;
+                      args.response.success({
+                        _custom: {
+                          jobId: jid
+                        }
+                      });
+                    }
+                  });
+                },
+                notification: {
+                  poll: pollAsyncJobResult
+                }
+              },
+
+              /*
+               changeService: {
+               label: 'label.change.service.offering',
+               createForm: {
+               title: 'label.change.service.offering',
+               desc: '',
+               fields: {
+               serviceOfferingId: {
+               label: 'label.compute.offering',
+               select: function(args) {
+               $.ajax({
+               url: createURL("listServiceOfferings&issystem=true&systemvmtype=domainrouter"),
+               dataType: "json",
+               async: true,
+               success: function(json) {
+               var serviceofferings = json.listserviceofferingsresponse.serviceoffering;
+               var items = [];
+               $(serviceofferings).each(function() {
+               if(this.id != args.context.routers[0].serviceofferingid) {
+               items.push({id: this.id, description: this.displaytext});
+               }
+               });
+               args.response.success({data: items});
+               }
+               });
+               }
+               }
+               }
+               },
+               messages: {
+               notification: function(args) {
+               return 'label.change.service.offering';
+               }
+               },
+               action: function(args) {
+               $.ajax({
+               url: createURL("changeServiceForRouter&id=" + args.context.routers[0].id + "&serviceofferingid=" + args.data.serviceOfferingId),
+               dataType: "json",
+               async: true,
+               success: function(json) {
+               var jsonObj = json.changeserviceforrouterresponse.domainrouter;
+               args.response.success({data: jsonObj});
+               },
+               error: function(XMLHttpResponse) {
+               var errorMsg = parseXMLHttpResponse(XMLHttpResponse);
+               args.response.error(errorMsg);
+               }
+               });
+               },
+               notification: {
+               poll: function(args) {
+               args.complete();
+               }
+               }
+               },
+               */
+
+              migrate: {
+                label: 'label.action.migrate.router',
+                createForm: {
+                  title: 'label.action.migrate.router',
+                  desc: '',
+                  fields: {
+                    hostId: {
+                      label: 'label.host',
+                      validation: { required: true },
+                      select: function(args) {
+                        $.ajax({
+                          url: createURL("listHosts&VirtualMachineId=" + args.context.routers[0].id),
+                          //url: createURL("listHosts"),	//for testing only, comment it out before checking in.
+                          dataType: "json",
+                          async: true,
+                          success: function(json) {
+                            var hostObjs = json.listhostsresponse.host;
+                            var items = [];
+                            $(hostObjs).each(function() {
+                              items.push({id: this.id, description: (this.name + ": " +(this.hasEnoughCapacity? "Available" : "Full"))});
+                            });
+                            args.response.success({data: items});
+                          }
+                        });
+                      },
+                      error: function(XMLHttpResponse) {
+                        var errorMsg = parseXMLHttpResponse(XMLHttpResponse);
+                        args.response.error(errorMsg);
+                      }
+                    }
+                  }
+                },
+                messages: {
+                  notification: function(args) {
+                    return 'label.action.migrate.router';
+                  }
+                },
+                action: function(args) {
+                  $.ajax({
+                    url: createURL("migrateSystemVm&hostid=" + args.data.hostId + "&virtualmachineid=" + args.context.routers[0].id),
+                    dataType: "json",
+                    async: true,
+                    success: function(json) {
+                      var jid = json.migratesystemvmresponse.jobid;
+                      args.response.success({
+                        _custom: {
+                          jobId: jid,
+                          getUpdatedItem: function(json) {
+                            //return json.queryasyncjobresultresponse.jobresult.systemvminstance;    //not all properties returned in systemvminstance
+                            $.ajax({
+                              url: createURL("listRouters&id=" + json.queryasyncjobresultresponse.jobresult.systemvminstance.id),
+                              dataType: "json",
+                              async: false,
+                              success: function(json) {
+                                var items = json.listroutersresponse.router;
+                                if(items != null && items.length > 0) {
+                                  return items[0];
+                                }
+                              }
+                            });
+                          },
+                          getActionFilter: function() {
+                            return routerActionfilter;
+                          }
+                        }
+                      });
+                    }
+                  });
+                },
+                notification: {
+                  poll: pollAsyncJobResult
+                }
+              },
+
+              viewConsole: {
+                label: 'label.view.console',
+                action: {
+                  externalLink: {
+                    url: function(args) {
+                      return clientConsoleUrl + '?cmd=access&vm=' + args.context.routers[0].id;
+                    },
+                    title: function(args) {
+                      return args.context.routers[0].id.substr(0,8);  //title in window.open() can't have space nor longer than 8 characters. Otherwise, IE browser will have error.
+                    },
+                    width: 820,
+                    height: 640
+                  }
+                }
+              }
+            },
+            tabs: {
+              details: {
+                title: 'label.details',
+                preFilter: function(args) {
+                  var hiddenFields = [];
+                  if (!args.context.routers[0].project) {
+                    hiddenFields.push('project');
+                    hiddenFields.push('projectid');
+                  }
+                  if(selectedZoneObj.networktype == 'Basic') {
+                    hiddenFields.push('publicip'); //In Basic zone, guest IP is public IP. So, publicip is not returned by listRouters API. Only guestipaddress is returned by listRouters API.
+                  }
+                  return hiddenFields;
+                },
+                fields: [
+                  {
+                    name: { label: 'label.name' },
+                    project: { label: 'label.project' }
+                  },
+                  {
+                    id: { label: 'label.id' },
+                    projectid: { label: 'label.project.id' },
+                    state: { label: 'label.state' },
+                    publicip: { label: 'label.public.ip' },
+                    guestipaddress: { label: 'label.guest.ip' },
+                    linklocalip: { label: 'label.linklocal.ip' },
+                    hostname: { label: 'label.host' },
+                    serviceofferingname: { label: 'label.compute.offering' },
+                    networkdomain: { label: 'label.network.domain' },
+                    domain: { label: 'label.domain' },
+                    account: { label: 'label.account' },
+                    created: { label: 'label.created', converter: cloudStack.converters.toLocalDate },
+                    isredundantrouter: {
+                      label: 'label.redundant.router',
+                      converter: cloudStack.converters.toBooleanText
+                    },
+                    redundantRouterState: { label: 'label.redundant.state' }
+                  }
+                ],
+                dataProvider: function(args) {
+                  $.ajax({
+                    url: createURL("listRouters&id=" + args.context.routers[0].id),
+                    dataType: 'json',
+                    async: true,
+                    success: function(json) {
+                      var jsonObj = json.listroutersresponse.router[0];
+                      addExtraPropertiesToRouterInstanceObject(jsonObj);
+                      args.response.success({
+                        actionFilter: routerActionfilter,
+                        data: jsonObj
+                      });
+                    }
+                  });
+                }
+              }
+            }
+          }
+        }
+      },
+      systemVms: {
+        listView: {
+          label: 'label.system.vms',
+          id: 'systemVMs',
+          fields: {
+            name: { label: 'label.name' },
+            systemvmtype: {
+              label: 'label.type',
+              converter: function(args) {
+                if(args == "consoleproxy")
+                  return "Console Proxy VM";
+                else if(args == "secondarystoragevm")
+                  return "Secondary Storage VM";
+                else
+                  return args;
+              }
+            },
+            zonename: { label: 'label.zone' },
+            state: {
+              label: 'label.status',
+              converter: function(str) {
+                // For localization
+                return str;
+              },
+              indicator: {
+                'Running': 'on',
+                'Stopped': 'off',
+                'Error': 'off',
+                'Destroyed': 'off'
+              }
+            }
+          },
+          dataProvider: function(args) {
+            var array1 = [];
+            if(args.filterBy != null) {
+              if(args.filterBy.search != null && args.filterBy.search.by != null && args.filterBy.search.value != null) {
+                switch(args.filterBy.search.by) {
+                  case "name":
+                    if(args.filterBy.search.value.length > 0)
+                      array1.push("&keyword=" + args.filterBy.search.value);
+                    break;
+                }
+              }
+            }
+
+            var selectedZoneObj = args.context.physicalResources[0];
+            $.ajax({
+              url: createURL("listSystemVms&zoneid=" + selectedZoneObj.id + "&page=" + args.page + "&pagesize=" + pageSize + array1.join("")),
+              dataType: "json",
+              async: true,
+              success: function(json) {
+                var items = json.listsystemvmsresponse.systemvm;
+                args.response.success({
+                  actionFilter: systemvmActionfilter,
+                  data: items
+                });
+              }
+            });
+          },
+
+          detailView: {
+            name: 'System VM details',
+            actions: {
+              start: {
+                label: 'label.action.start.systemvm',
+                messages: {
+                  confirm: function(args) {
+                    return 'message.action.start.systemvm';
+                  },
+                  notification: function(args) {
+                    return 'label.action.start.systemvm';
+                  }
+                },
+                action: function(args) {
+                  $.ajax({
+                    url: createURL('startSystemVm&id=' + args.context.systemVMs[0].id),
+                    dataType: 'json',
+                    async: true,
+                    success: function(json) {
+                      var jid = json.startsystemvmresponse.jobid;
+                      args.response.success({
+                        _custom: {
+                          jobId: jid,
+                          getUpdatedItem: function(json) {
+                            return json.queryasyncjobresultresponse.jobresult.systemvm;
+                          },
+                          getActionFilter: function() {
+                            return systemvmActionfilter;
+                          }
+                        }
+                      });
+                    }
+                  });
+                },
+                notification: {
+                  poll: pollAsyncJobResult
+                }
+              },
+
+              stop: {
+                label: 'label.action.stop.systemvm',
+                messages: {
+                  confirm: function(args) {
+                    return 'message.action.stop.systemvm';
+                  },
+                  notification: function(args) {
+                    return 'label.action.stop.systemvm';
+                  }
+                },
+                action: function(args) {
+                  $.ajax({
+                    url: createURL('stopSystemVm&id=' + args.context.systemVMs[0].id),
+                    dataType: 'json',
+                    async: true,
+                    success: function(json) {
+                      var jid = json.stopsystemvmresponse.jobid;
+                      args.response.success({
+                        _custom: {
+                          jobId: jid,
+                          getUpdatedItem: function(json) {
+                            return json.queryasyncjobresultresponse.jobresult.systemvm;
+                          },
+                          getActionFilter: function() {
+                            return systemvmActionfilter;
+                          }
+                        }
+                      });
+                    }
+                  });
+                },
+                notification: {
+                  poll: pollAsyncJobResult
+                }
+              },
+
+              restart: {
+                label: 'label.action.reboot.systemvm',
+                messages: {
+                  confirm: function(args) {
+                    return 'message.action.reboot.systemvm';
+                  },
+                  notification: function(args) {
+                    return 'label.action.reboot.systemvm';
+                  }
+                },
+                action: function(args) {
+                  $.ajax({
+                    url: createURL('rebootSystemVm&id=' + args.context.systemVMs[0].id),
+                    dataType: 'json',
+                    async: true,
+                    success: function(json) {
+                      var jid = json.rebootsystemvmresponse.jobid;
+                      args.response.success({
+                        _custom: {
+                          jobId: jid,
+                          getUpdatedItem: function(json) {
+                            return json.queryasyncjobresultresponse.jobresult.systemvm;
+                          },
+                          getActionFilter: function() {
+                            return systemvmActionfilter;
+                          }
+                        }
+                      });
+                    }
+                  });
+                },
+                notification: {
+                  poll: pollAsyncJobResult
+                }
+              },
+
+              changeService: {
+                label: 'label.change.service.offering',
+                createForm: {
+                  title: 'label.change.service.offering',
+                  desc: '',
+                  fields: {
+                    serviceOfferingId: {
+                      label: 'label.compute.offering',
+                      select: function(args) {
+                        var apiCmd = "listServiceOfferings&issystem=true";
+                        if(args.context.systemVMs[0].systemvmtype == "secondarystoragevm")
+                          apiCmd += "&systemvmtype=secondarystoragevm";
+                        else if(args.context.systemVMs[0].systemvmtype == "consoleproxy")
+                          apiCmd += "&systemvmtype=consoleproxy";
+                        $.ajax({
+                          url: createURL(apiCmd),
+                          dataType: "json",
+                          async: true,
+                          success: function(json) {
+                            var serviceofferings = json.listserviceofferingsresponse.serviceoffering;
+                            var items = [];
+                            $(serviceofferings).each(function() {
+                              if(this.id != args.context.systemVMs[0].serviceofferingid) {
+                                items.push({id: this.id, description: this.displaytext});
+                              }
+                            });
+                            args.response.success({data: items});
+                          }
+                        });
+                      }
+                    }
+                  }
+                },
+                messages: {
+                  notification: function(args) {
+                    return 'label.change.service.offering';
+                  }
+                },
+                action: function(args) {
+                  $.ajax({
+                    url: createURL("changeServiceForSystemVm&id=" + args.context.systemVMs[0].id + "&serviceofferingid=" + args.data.serviceOfferingId),
+                    dataType: "json",
+                    async: true,
+                    success: function(json) {
+                      var jsonObj = json.changeserviceforsystemvmresponse.systemvm;
+                      args.response.success({data: jsonObj});
+                    },
+                    error: function(XMLHttpResponse) {
+                      var errorMsg = parseXMLHttpResponse(XMLHttpResponse);
+                      args.response.error(errorMsg);
+                    }
+                  });
+                },
+                notification: {
+                  poll: function(args) {
+                    args.complete();
+                  }
+                }
+              },
+
+              remove: {
+                label: 'label.action.destroy.systemvm',
+                messages: {
+                  confirm: function(args) {
+                    return 'message.action.destroy.systemvm';
+                  },
+                  notification: function(args) {
+                    return 'label.action.destroy.systemvm';
+                  }
+                },
+                action: function(args) {
+                  $.ajax({
+                    url: createURL('destroySystemVm&id=' + args.context.systemVMs[0].id),
+                    dataType: 'json',
+                    async: true,
+                    success: function(json) {
+                      var jid = json.destroysystemvmresponse.jobid;
+                      args.response.success({
+                        _custom: {
+                          getUpdatedItem: function() {
+                            return { state: 'Destroyed' };
+                          },
+                          jobId: jid
+                        }
+                      });
+                    }
+                  });
+                },
+                notification: {
+                  poll: pollAsyncJobResult
+                }
+              },
+
+              migrate: {
+                label: 'label.action.migrate.systemvm',
+                messages: {
+                  notification: function(args) {
+                    return 'label.action.migrate.systemvm';
+                  }
+                },
+                createForm: {
+                  title: 'label.action.migrate.systemvm',
+                  desc: '',
+                  fields: {
+                    hostId: {
+                      label: 'label.host',
+                      validation: { required: true },
+                      select: function(args) {
+                        $.ajax({
+                          url: createURL("listHosts&VirtualMachineId=" + args.context.systemVMs[0].id),
+                          //url: createURL("listHosts"),	//for testing only, comment it out before checking in.
+                          dataType: "json",
+                          async: true,
+                          success: function(json) {
+                            var hostObjs = json.listhostsresponse.host;
+                            var items = [];
+                            $(hostObjs).each(function() {
+                              items.push({id: this.id, description: (this.name + ": " +(this.hasEnoughCapacity? "Available" : "Full"))});
+                            });
+                            args.response.success({data: items});
+                          }
+                        });
+                      },
+                      error: function(XMLHttpResponse) {
+                        var errorMsg = parseXMLHttpResponse(XMLHttpResponse);
+                        args.response.error(errorMsg);
+                      }
+                    }
+                  }
+                },
+                action: function(args) {
+                  $.ajax({
+                    url: createURL("migrateSystemVm&hostid=" + args.data.hostId + "&virtualmachineid=" + args.context.systemVMs[0].id),
+                    dataType: "json",
+                    async: true,
+                    success: function(json) {
+                      var jid = json.migratesystemvmresponse.jobid;
+                      args.response.success({
+                        _custom: {
+                          jobId: jid,
+                          getUpdatedItem: function(json) {
+                            //return json.queryasyncjobresultresponse.jobresult.systemvminstance;    //not all properties returned in systemvminstance
+                            $.ajax({
+                              url: createURL("listSystemVms&id=" + json.queryasyncjobresultresponse.jobresult.systemvminstance.id),
+                              dataType: "json",
+                              async: false,
+                              success: function(json) {
+                                var items = json.listsystemvmsresponse.systemvm;
+                                if(items != null && items.length > 0) {
+                                  return items[0];
+                                }
+                              }
+                            });
+                          },
+                          getActionFilter: function() {
+                            return systemvmActionfilter;
+                          }
+                        }
+                      });
+                    }
+                  });
+                },
+                notification: {
+                  poll: pollAsyncJobResult
+                }
+              },
+
+              viewConsole: {
+                label: 'label.view.console',
+                action: {
+                  externalLink: {
+                    url: function(args) {
+                      return clientConsoleUrl + '?cmd=access&vm=' + args.context.systemVMs[0].id;
+                    },
+                    title: function(args) {
+                      return args.context.systemVMs[0].id.substr(0,8);  //title in window.open() can't have space nor longer than 8 characters. Otherwise, IE browser will have error.
+                    },
+                    width: 820,
+                    height: 640
+                  }
+                }
+              }
+            },
+            tabs: {
+              details: {
+                title: 'label.details',
+                fields: [
+                  {
+                    name: { label: 'label.name' }
+                  },
+                  {
+                    id: { label: 'label.id' },
+                    state: { label: 'label.state' },
+                    systemvmtype: {
+                      label: 'label.type',
+                      converter: function(args) {
+                        if(args == "consoleproxy")
+                          return "Console Proxy VM";
+                        else if(args == "secondarystoragevm")
+                          return "Secondary Storage VM";
+                        else
+                          return args;
+                      }
+                    },
+                    zonename: { label: 'label.zone' },
+                    publicip: { label: 'label.public.ip' },
+                    privateip: { label: 'label.private.ip' },
+                    linklocalip: { label: 'label.linklocal.ip' },
+                    hostname: { label: 'label.host' },
+                    gateway: { label: 'label.gateway' },
+                    created: { label: 'label.created', converter: cloudStack.converters.toLocalDate },
+                    activeviewersessions: { label: 'label.active.sessions' }
+                  }
+                ],
+                dataProvider: function(args) {
+                  $.ajax({
+                    url: createURL("listSystemVms&id=" + args.context.systemVMs[0].id),
+                    dataType: "json",
+                    async: true,
+                    success: function(json) {
+                      args.response.success({
+                        actionFilter: systemvmActionfilter,
+                        data: json.listsystemvmsresponse.systemvm[0]
+                      });
+                    }
+                  });
+                }
+              }
+            }
+          }
+        }
+      },
+  // netscaler devices listView
       netscalerDevices: {
         id: 'netscalerDevices',
         title: 'label.devices',
@@ -6129,13 +7144,38 @@
               createForm: {
                 title: 'label.add.primary.storage',
                 fields: {
-                  //always appear (begin)
+                  zoneid: {
+                    label: 'Zone',
+                    validation: { required: true },
+                    select: function(args) {
+                      var data = args.context.zones ?
+                      { id: args.context.zones[0].id } : { listAll: true };
+
+                      $.ajax({
+                        url: createURL('listZones'),
+                        data: data,
+                        success: function(json) {
+                          var zones = json.listzonesresponse.zone;
+
+                          args.response.success({
+                            data: $.map(zones, function(zone) {
+                              return {
+                                id: zone.id,
+                                description: zone.name
+                              };
+                            })
+                          });
+                        }
+                      });
+                    }
+                  },
                   podId: {
                     label: 'label.pod',
+                    dependsOn: 'zoneid',
                     validation: { required: true },
                     select: function(args) {
                       $.ajax({
-                        url: createURL("listPods&zoneid=" + args.context.zones[0].id),
+                        url: createURL("listPods&zoneid=" + args.zoneid),
                         dataType: "json",
                         async: true,
                         success: function(json) {
@@ -6460,7 +7500,7 @@
 
               action: function(args) {
                 var array1 = [];
-                array1.push("&zoneid=" + args.context.zones[0].id);
+                array1.push("&zoneid=" + args.data.zoneid);
                 array1.push("&podId=" + args.data.podId);
                 array1.push("&clusterid=" + args.data.clusterId);
                 array1.push("&name=" + todb(args.data.name));
@@ -6810,6 +7850,31 @@
               createForm: {
                 title: 'label.add.secondary.storage',
                 fields: {
+                  zoneid: {
+                    label: 'Zone',
+                    validation: { required: true },
+                    select: function(args) {
+                      var data = args.context.zones ?
+                      { id: args.context.zones[0].id } : { listAll: true };
+
+                      $.ajax({
+                        url: createURL('listZones'),
+                        data: data,
+                        success: function(json) {
+                          var zones = json.listzonesresponse.zone;
+
+                          args.response.success({
+                            data: $.map(zones, function(zone) {
+                              return {
+                                id: zone.id,
+                                description: zone.name
+                              };
+                            })
+                          });
+                        }
+                      });
+                    }
+                  },
                   nfsServer: {
                     label: 'label.nfs.server',
                     validation: { required: true }
@@ -6822,7 +7887,7 @@
               },
 
               action: function(args) {
-                var zoneId = args.context.zones[0].id;
+                var zoneId = args.data.zoneid;
                 var nfs_server = args.data.nfsServer;
                 var path = args.data.path;
                 var url = nfsURL(nfs_server, path);
@@ -7581,7 +8646,7 @@
 				});
 			}
 		});
-	}
+	};
 
   //action filters (begin)
   var zoneActionfilter = function(args) {
diff --git a/ui/scripts/ui-custom/physicalResources.js b/ui/scripts/ui-custom/physicalResources.js
index 257843f838e..8acdec60188 100644
--- a/ui/scripts/ui-custom/physicalResources.js
+++ b/ui/scripts/ui-custom/physicalResources.js
@@ -41,7 +41,7 @@
           if ($target.closest('[view-all-target]').size()) {
             var targetID = $target.closest('[view-all-target]').attr('view-all-target');
             args.$browser.cloudBrowser('addPanel', {
-              title: targetID.charAt(0).toUpperCase() + targetID.substr(1).toLowerCase(),
+              title: $target.closest('[view-all-title]').attr('view-all-title'),
               data: '',
               noSelectPanel: true,
               maximizeIfSelected: true,