diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/android.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/android.hbs
index 5f3c15e0..858e1919 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/android.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/android.hbs
@@ -18,11 +18,11 @@
                     <br><br>
                                 <span class="fw-stack fw-lg margin-right">
                                     <i class="fw fw-ring fw-stack-2x"> </i>
-                                    <i class="fw fw-right-arrow-2 fw-stack-1x"></i>
+                                    <i class="fw fw-right-arrow fw-stack-1x"></i>
                                 </span>Arduino Uno<br><br>
                                 <span class="fw-stack fw-lg margin-right">
                                     <i class="fw fw-ring fw-stack-2x"> </i>
-                                    <i class="fw fw-right-arrow-2 fw-stack-1x"></i>
+                                    <i class="fw fw-right-arrow fw-stack-1x"></i>
                                 </span>Arduino Ethernet / WiFi Shield
 								<br /><br />
 								<form method="POST" class="float-left margin-right"
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android_sense/android_sense.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android_sense/android_sense.hbs
index e9442e72..1fc1f783 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android_sense/android_sense.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android_sense/android_sense.hbs
@@ -18,7 +18,7 @@
                     <br><br>
                                 <span class="fw-stack fw-lg margin-right">
                                     <i class="fw fw-ring fw-stack-2x"> </i>
-                                    <i class="fw fw-right-arrow-2 fw-stack-1x"></i>
+                                    <i class="fw fw-right-arrow fw-stack-1x"></i>
                                 </span>Android Phone<br><br>
                     <br/><br/>
 
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/arduino/arduino.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/arduino/arduino.hbs
index 92412e4e..8096c3c6 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/arduino/arduino.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/arduino/arduino.hbs
@@ -18,11 +18,11 @@
                     <br><br>
                                 <span class="fw-stack fw-lg margin-right">
                                     <i class="fw fw-ring fw-stack-2x"> </i>
-                                    <i class="fw fw-right-arrow-2 fw-stack-1x"></i>
+                                    <i class="fw fw-right-arrow fw-stack-1x"></i>
                                 </span>Arduino Uno<br><br>
                                 <span class="fw-stack fw-lg margin-right">
                                     <i class="fw fw-ring fw-stack-2x"> </i>
-                                    <i class="fw fw-right-arrow-2 fw-stack-1x"></i>
+                                    <i class="fw fw-right-arrow fw-stack-1x"></i>
                                 </span>Arduino Ethernet / WiFi Shield
 								<br /><br />
                                 <form method="POST" class="form-login-box"
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-detail/device-detail.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-detail/device-detail.hbs
index 234f0a13..e14547ff 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-detail/device-detail.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-detail/device-detail.hbs
@@ -25,7 +25,8 @@
                     <div class="col-lg-2 ast-desc-image">
                         <div class="row">
                             <div class="col-lg-12 col-sm-4">
-                                <img src="{{self.publicURL}}/img/device_icons/{{device.type}}.png" style="width:200px"/>
+                                <img src="{{self.publicURL}}/img/device_icons/{{device.type}}.png"
+                                     style="width:200px"/>
                             </div>
                             <div class="col-lg-12 col-sm-4 ast-desc">
                                 <div class="ast-device-desc"><b>Owner:</b> {{device.owner}}</div>
@@ -51,8 +52,11 @@
                                         <div class="wr-stats-board-tile">
                                             <div class="tile-name">BATTERY</div>
                                             <div>
-                                                <div class="tile-icon"><i class="fw fw-battery"></i></div>
-                                                <div class="tile-stats">{{device.viewModel.BatteryLevel}}%</div>
+                                                <div class="tile-icon"><i class="fw fw-battery"></i>
+                                                </div>
+                                                <div class="tile-stats">{{device.viewModel.BatteryLevel}}
+                                                    %
+                                                </div>
                                             </div>
                                         </div>
                                     </div>
@@ -63,7 +67,8 @@
                                         <div class="wr-stats-board-tile">
                                             <div class="tile-name">STORAGE</div>
                                             <div>
-                                                <div class="tile-icon"><i class="fw fw-hdd"></i></div>
+                                                <div class="tile-icon"><i class="fw fw-hdd"></i>
+                                                </div>
                                                 <div class="tile-stats">{{device.viewModel.DeviceCapacityPercentage}}
                                                     %<span class="tile-stats-free">{{device.viewModel.DeviceCapacityUsed}}
                                                         GB Free</span></div>
@@ -76,7 +81,8 @@
                                         <div class="wr-stats-board-tile">
                                             <div class="tile-name">LOCAL STORAGE</div>
                                             <div>
-                                                <div class="tile-icon"><i class="fw fw-hdd"></i></div>
+                                                <div class="tile-icon"><i class="fw fw-hdd"></i>
+                                                </div>
                                                 <div class="tile-stats">{{device.viewModel.internal_memory.DeviceCapacityPercentage}}
                                                     %<span class="tile-stats-free">{{device.viewModel.internal_memory.FreeCapacity}}
                                                         GB Free</span></div>
@@ -89,7 +95,8 @@
                                         <div class="wr-stats-board-tile">
                                             <div class="tile-name">EXTERNAL STORAGE</div>
                                             <div>
-                                                <div class="tile-icon"><i class="fw fw-hdd"></i></div>
+                                                <div class="tile-icon"><i class="fw fw-hdd"></i>
+                                                </div>
                                                 <div class="tile-stats">{{device.viewModel.external_memory.DeviceCapacityPercentage}}
                                                     %<span class="tile-stats-free">{{device.viewModel.external_memory.FreeCapacity}}
                                                         GB Free</span></div>
@@ -102,23 +109,52 @@
                         </div>
                         <!-- /device summary -->
 
-                        <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
+                        <div class="panel-group" id="accordion" role="tablist"
+                             aria-multiselectable="true">
+
+                            <!--device location -->
+                            <div class="panel panel-default">
+                                <div class="panel-heading" role="tab" id="headingOne">
+                                    <h2 class="sub-title panel-title">
+                                        <a data-toggle="collapse" data-parent="#accordion"
+                                           href="#collapseOne" aria-expanded="true"
+                                           aria-controls="collapseOne">
+                                        <span class="fw-stack">
+                                        <i class="fw fw-ring fw-stack-2x"></i>
+                                        <i class="fw fw-arrow fw-down fw-stack-1x"></i>
+                                        </span>
+                                            Device Details
+                                        </a>
+                                    </h2>
+                                </div>
+                                <div id="collapseOne" class="panel-collapse collapse in"
+                                     role="tabpanel" aria-labelledby="headingOne">
+                                    <div id="device-location" class="panel-body">
+                                            IP Address: 0.0.0.0
+                                    </div>
+                                </div>
+                            </div>
+                            <!--/device location -->
+
 
                             <!-- statistics -->
                             <div class="panel panel-default">
                                 <div class="panel-heading" role="tab" id="headingFour">
                                     <h2 class="sub-title panel-title">
-                                        <a class="collapsed" data-toggle="collapse" data-parent="#accordion"
-                                           href="#collapseFour" aria-expanded="false" aria-controls="collapseFour">
+                                        <a class="collapsed" data-toggle="collapse"
+                                           data-parent="#accordion"
+                                           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>
                                             Device Statistics
                                         </a>
                                     </h2>
                                 </div>
-                                <div id="collapseFour" class="panel-collapse collapse" role="tabpanel"
+                                <div id="collapseFour" class="panel-collapse collapse"
+                                     role="tabpanel"
                                      aria-labelledby="headingFour">
                                     <div class="panel-body">
                                         <a href="../../analytics?deviceId={{deviceId}}&deviceType={{deviceType}}"><i
@@ -128,42 +164,24 @@
                             </div>
                             <!-- /statistics -->
 
-                            <!-- device location -->
-                            <!--<div class="panel panel-default">-->
-                            <!--<div class="panel-heading" role="tab" id="headingOne">-->
-                            <!--<h2 class="sub-title panel-title">-->
-                            <!--<a data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">-->
-                            <!--<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>-->
-                            <!--</span>-->
-                            <!--Device Location-->
-                            <!--</a>-->
-                            <!--</h2>-->
-                            <!--</div>-->
-                            <!--<div id="collapseOne" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">-->
-                            <!--<div id="device-location" style="height:400px" class="panel-body">-->
-
-                            <!--</div>-->
-                            <!--</div>-->
-                            <!--</div>-->
-                            <!-- /device location -->
-
                             <!-- policies -->
                             <div class="panel panel-default">
                                 <div class="panel-heading" role="tab" id="headingTwo">
                                     <h2 class="sub-title panel-title">
-                                        <a class="collapsed" data-toggle="collapse" data-parent="#accordion"
-                                           href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
+                                        <a class="collapsed" data-toggle="collapse"
+                                           data-parent="#accordion"
+                                           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>
                                             Policies
                                         </a>
                                     </h2>
                                 </div>
-                                <div id="collapseTwo" class="panel-collapse collapse" role="tabpanel"
+                                <div id="collapseTwo" class="panel-collapse collapse"
+                                     role="tabpanel"
                                      aria-labelledby="headingTwo">
                                     <div class="panel-body">
                                         Not available yet
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/digital_display/digital_display.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/digital_display/digital_display.hbs
index 1b8d3d58..983fb891 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/digital_display/digital_display.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/digital_display/digital_display.hbs
@@ -8,8 +8,6 @@
                     <p  class="margin-bottom-double light-grey ">Connect your Digital Display device
                     to the WSO2 device cloud. </p>
                 </div>
-            </div>
-            <div class="row margin-bottom-double">
                 <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top">
                 <img src="{{self.publicURL}}/images/digital_display.png" class="img-responsive">
             </div>
@@ -20,11 +18,11 @@
                     <br><br>
                                 <span class="fw-stack fw-lg margin-right">
                                     <i class="fw fw-ring fw-stack-2x"> </i>
-                                    <i class="fw fw-right-arrow-2 fw-stack-1x"></i>
+                                    <i class="fw fw-right-arrow fw-stack-1x"></i>
                                 </span>Raspberry Pi<br><br>
                                 <span class="fw-stack fw-lg margin-right">
                                     <i class="fw fw-ring fw-stack-2x"> </i>
-                                    <i class="fw fw-right-arrow-2 fw-stack-1x"></i>
+                                    <i class="fw fw-right-arrow fw-stack-1x"></i>
                                 </span>HDMI Supported Digital Display
 								<br /><br />
 								<form method="POST" class="float-left margin-right"
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/firealarm/firealarm.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/firealarm/firealarm.hbs
index 5f81900f..55add972 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/firealarm/firealarm.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/firealarm/firealarm.hbs
@@ -10,7 +10,7 @@
                 </div>
                 <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top">
                 <img src="{{self.publicURL}}/images/firealarm.png" class="img-responsive">
-            </div>
+                </div>
                 <div class="col-xs-12 col-sm-6 col-md-8 col-lg-8 padding-top">
                     <h2 class="uppercase">Ingredients</h2>
                     <hr>
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/operation-bar/operation-bar.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/operation-bar/operation-bar.hbs
index 58cb23e9..4a7d0251 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/operation-bar/operation-bar.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/operation-bar/operation-bar.hbs
@@ -1,7 +1,7 @@
 {{#zone "main"}}
     <a href="javascript:toggleMoreOperations()" class="cu-btn-inner show-operations-btn hidden" id="showOperationsBtn">
                     <span class="fw-stack">
-                        <i class="fw fw-right-arrow-2 fw-stack-1-5x"></i>
+                        <i class="fw fw-right-arrow fw-stack-1-5x"></i>
                     </span>
         <span class="btn-text">Operations</span>
     </a>
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/raspberrypi/raspberrypi.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/raspberrypi/raspberrypi.hbs
index 5f373ef9..d5a5185c 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/raspberrypi/raspberrypi.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/raspberrypi/raspberrypi.hbs
@@ -8,8 +8,6 @@
                     <p  class="margin-bottom-double light-grey ">Connect your Raspberry Pi device
                     to the WSO2 Device Cloud. </p>
                 </div>
-            </div>
-            <div class="row margin-bottom-double">
                 <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top">
                 <img src="{{self.publicURL}}/images/raspberrypi.png" class="img-responsive">
             </div>
@@ -20,7 +18,7 @@
                     <br><br>
                                 <span class="fw-stack fw-lg margin-right">
                                     <i class="fw fw-ring fw-stack-2x"> </i>
-                                    <i class="fw fw-right-arrow-2 fw-stack-1x"></i>
+                                    <i class="fw fw-right-arrow fw-stack-1x"></i>
                                 </span>Raspberry Pi<br><br>
                                 <form method="POST" class="form-login-box"
                                 action="{{sketchPath}}">
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/sensebot/sensebot.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/sensebot/sensebot.hbs
index 550ef079..01a02016 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/sensebot/sensebot.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/sensebot/sensebot.hbs
@@ -8,8 +8,6 @@
                     <p  class="margin-bottom-double light-grey ">Connect your Sensebot
                     to the WSO2 device cloud. </p>
                 </div>
-            </div>
-            <div class="row margin-bottom-double">
                 <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top">
                 <img src="{{self.publicURL}}/images/sensebot.png" class="img-responsive">
             </div>
@@ -20,11 +18,11 @@
                     <br><br>
                                 <span class="fw-stack fw-lg margin-right">
                                     <i class="fw fw-ring fw-stack-2x"> </i>
-                                    <i class="fw fw-right-arrow-2 fw-stack-1x"></i>
+                                    <i class="fw fw-right-arrow fw-stack-1x"></i>
                                 </span>Arduino Uno<br><br>
                                 <span class="fw-stack fw-lg margin-right">
                                     <i class="fw fw-ring fw-stack-2x"> </i>
-                                    <i class="fw fw-right-arrow-2 fw-stack-1x"></i>
+                                    <i class="fw fw-right-arrow fw-stack-1x"></i>
                                 </span>Arduino Ethernet / WiFi Shield
 								<br /><br />
 								<form method="POST" class="float-left margin-right"
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/theme/public/css/custom-desktop.css b/modules/distribution/src/repository/jaggeryapps/iotserver/units/theme/public/css/custom-desktop.css
index 102e5041..a7a3f839 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/theme/public/css/custom-desktop.css
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/theme/public/css/custom-desktop.css
@@ -1658,7 +1658,7 @@ a.wr-side-panel-toggle-btn.selected {
 .wr-input-control.checkbox input[type="checkbox"]:checked + .helper:after {
     position: absolute;
     display: block;
-    content: "\e631";
+    content: "\e617";
     font-size: 7pt;
     height: 16px;
     width: 16px;
@@ -1797,7 +1797,7 @@ a.wr-side-panel-toggle-btn.selected {
 }
 
 .panel-title a.collapsed .fw-arrow:before {
-    content: "\e634";
+    content: "\e687";
 }
 
 .footer a {
@@ -2031,7 +2031,7 @@ a.show-operations-btn.selected {
     color: #fff;
 }
 
-a.show-operations-btn.selected .fw-right-arrow-2:before {
+a.show-operations-btn.selected .fw-right-arrow:before {
     content: "\e662";
 }
 
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/theme/public/css/main.css b/modules/distribution/src/repository/jaggeryapps/iotserver/units/theme/public/css/main.css
index 47076c0c..09eaa973 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/theme/public/css/main.css
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/theme/public/css/main.css
@@ -170,6 +170,10 @@ a {
     vertical-align:baseline;
     background:transparent;
 }
+
+a:hover {
+    text-decoration: none;
+}
 /* change colours to suit your needs */
 ins {
     background-color:#ff9;
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/windows/windows.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/windows/windows.hbs
index 89d151c6..b19c41d0 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/windows/windows.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/windows/windows.hbs
@@ -20,11 +20,11 @@
                     <br><br>
                                 <span class="fw-stack fw-lg margin-right">
                                     <i class="fw fw-ring fw-stack-2x"> </i>
-                                    <i class="fw fw-right-arrow-2 fw-stack-1x"></i>
+                                    <i class="fw fw-right-arrow fw-stack-1x"></i>
                                 </span>Arduino Uno<br><br>
                                 <span class="fw-stack fw-lg margin-right">
                                     <i class="fw fw-ring fw-stack-2x"> </i>
-                                    <i class="fw fw-right-arrow-2 fw-stack-1x"></i>
+                                    <i class="fw fw-right-arrow fw-stack-1x"></i>
                                 </span>Arduino Ethernet / WiFi Shield
 								<br /><br />
 								<form method="POST" class="float-left margin-right"