diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-listing/group-listing.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-listing/group-listing.hbs
index c1d642b7..e34e9e84 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-listing/group-listing.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-listing/group-listing.hbs
@@ -18,7 +18,7 @@
             <div class="ctrl-info-panel col-md-6 col-centered">
                 <h2>You don't have any Groups registered at the moment.</h2>
                 <p>
-                    <a href="#" class="cu-btn add-group-link">
+                    <a href="/iotserver/groups/add-group" class="cu-btn add-group-link">
                     <span class="fw-stack">
                         <i class="fw fw-ring fw-stack-2x"></i>
                         <i class="fw fw-add fw-stack-1x"></i>
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-listing/public/templates/group-listing.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-listing/public/templates/group-listing.hbs
index f145e844..d85363af 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-listing/public/templates/group-listing.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-listing/public/templates/group-listing.hbs
@@ -1,5 +1,5 @@
 {{#each groups}}
-	{{groupMap this}}
+    {{groupMap this}}
     <form id="group-data-form-{{id}}" action="/iotserver/group/{{id}}" method="POST">
         <input type="hidden" name="name" value="{{name}}">
         <input type="hidden" name="deviceCount" value="{{deviceCount}}">
@@ -9,7 +9,7 @@
         <input type="hidden" name="users" value="{{users}}">
     </form>
 
-    <div href="#" class="ctrl-wr-asset" data-groupid="{{id}}">
+    <div class="ctrl-wr-asset" data-groupid="{{id}}">
         <div class="itm-select">
             <label class="wr-input-control checkbox">
                 <input type="checkbox"/>
@@ -17,13 +17,16 @@
             </label>
         </div>
         <div class="itm-ast">
-            <div class="ast-img view-group-link" data-groupid="{{id}}"><img src="{{../imageLocation}}group-icon.png"/></div>
+            <div class="ast-img view-group-link" data-groupid="{{id}}"><img src="{{../imageLocation}}group-icon.png"/>
+            </div>
             <div class="ast-desc">
                 <div class="ast-title view-group-link" data-groupid="{{id}}">
                     <h3 class="ast-name">{{name}}</h3>
-                    <span class="ast-auth">Device Count: {{deviceCount}}</span>
+                    <span class="ast-auth">Device Count: {{devices.length}}</span>
                     <span class="ast-auth">Created On: <span class="formatDate">{{dateOfCreation}}</span></span>
-                    <span class="ast-ver">Shared with: {{users}}</span>
+                    <span class="ast-ver">Owner: {{owner}}</span>
+                    <br/>
+                    <span class="ast-ver">Shared with: {{#each users}}{{username}}, {{/each}}</span>
                 </div>
                 <div class="ast-model">
 
@@ -80,4 +83,4 @@
 
 {{/each}}
 
-<br class="c-both"/>
+<br class="c-both"/>
\ No newline at end of file