diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/templates/device-listing.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/templates/device-listing.hbs
index 319de10e..3fc02326 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/templates/device-listing.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/templates/device-listing.hbs
@@ -8,7 +8,7 @@
             </label>
         </div>
         <div class="itm-ast">
-            <a href="device/{{type}}/{{deviceIdentifier}}">
+            <a href="/iotserver/device/{{type}}/{{deviceIdentifier}}">
                 <div class="ast-img"><img src="{{../imageLocation}}{{type}}.png"/></div>
                 <div class="ast-desc">
                     <div class="ast-title">
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/footer/footer.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/footer/footer.hbs
index ab43f387..678ed6e3 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/footer/footer.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/footer/footer.hbs
@@ -1,7 +1,7 @@
 {{#zone "footer"}}
     <footer class="footer">
         <p>
-            WSO2 IOT Device Manager v.1.0.0 | &copy; <script>document.write(new Date().getFullYear());</script> <a href="http://wso2.com/" target="_blank"><i class="fw fw-wso2"></i> Inc</a>. All Rights Reserved.
+            WSO2 IoT Device Manager v.1.0.0 | &copy; <script>document.write(new Date().getFullYear());</script> <a href="http://wso2.com/" target="_blank"><i class="fw fw-wso2"></i> Inc</a>. All Rights Reserved.
         </p>
     </footer>
 {{/zone}}
\ No newline at end of file
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-detail/group-detail.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-detail/group-detail.hbs
index 0a0af0b6..3b8dd302 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-detail/group-detail.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-detail/group-detail.hbs
@@ -60,7 +60,7 @@
                                            href="#collapseFour" aria-expanded="false" aria-controls="collapseFour">
                                         <span class="fw-stack">
                                             <i class="fw fw-ring fw-stack-2x"></i>
-                                            <i class="fw fw-arrow fw-down-arrow fw-stack-1x"></i>
+                                            <i class="fw fw-arrow fw-down fw-stack-1x"></i>
                                         </span>
                                             Group Statistics
                                         </a>
@@ -83,7 +83,7 @@
                                            href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
                                         <span class="fw-stack">
                                             <i class="fw fw-ring fw-stack-2x"></i>
-                                            <i class="fw fw-arrow fw-down-arrow fw-stack-1x"></i>
+                                            <i class="fw fw-arrow fw-down fw-stack-1x"></i>
                                         </span>
                                             Group Devices
                                         </a>