diff --git a/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/css/styles.css b/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/css/styles.css
new file mode 100644
index 000000000..0c138185a
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/css/styles.css
@@ -0,0 +1,68 @@
+/*
+ *  Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+.circle {
+    background: none repeat scroll 0 0 #191919;
+    border-radius: 50px;
+    height: 50px;
+    padding: 10px;
+    width: 50px;
+    color: #fff;
+}
+
+.padding-top-double {
+    padding-top: 20px;
+}
+
+.padding-double {
+    padding: 20px;
+}
+
+.grey {
+    color: #333;
+}
+
+hr {
+    display: block;
+    height: 1px;
+    border: 0;
+    border-top: 1px solid #7f7f7f;
+    margin: 1em 0;
+    padding: 0;
+    opacity: 0.2;
+}
+
+.light-grey {
+    color: #7c7c7c;
+}
+
+.uppercase {
+    text-transform: uppercase;
+}
+
+.grey-bg {
+    background-color: #f6f4f4;
+}
+
+.doc-link {
+    background: #11375B;
+    padding: 20px;
+    color: white;
+    margin-top: 0;
+}
+
+.doc-link a {
+    color: white;
+}
\ No newline at end of file
diff --git a/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs b/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs
index a243a0302..8fb2ff97c 100644
--- a/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs
+++ b/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs
@@ -272,61 +272,9 @@
     </div>
 </div>
 
-<style type="text/css">
-    .circle {
-        background: none repeat scroll 0 0 #191919;
-        border-radius: 50px;
-        height: 50px;
-        padding: 10px;
-        width: 50px;
-        color: #fff;
-    }
-
-    .padding-top-double {
-        padding-top: 20px;
-    }
-
-    .padding-double {
-        padding: 20px;
-    }
-
-    .grey {
-        color: #333;
-    }
-
-    hr {
-        display: block;
-        height: 1px;
-        border: 0;
-        border-top: 1px solid #7f7f7f;
-        margin: 1em 0;
-        padding: 0;
-        opacity: 0.2;
-    }
-
-    .light-grey {
-        color: #7c7c7c;
-    }
-
-    .uppercase {
-        text-transform: uppercase;
-    }
-
-    .grey-bg {
-        background-color: #f6f4f4;
-    }
-
-    .doc-link {
-        background: #11375B;
-        padding: 20px;
-        color: white;
-        margin-top: 0;
-    }
-
-    .doc-link a {
-        color: white;
-    }
-</style>
+{{#zone "topCss"}}
+    {{css "css/styles.css"}}
+{{/zone}}
 
 {{#zone "bottomJs"}}
     {{js "/js/download.js"}}
@@ -342,4 +290,4 @@
         }
     </script>
     {{js "/js/jquery.validate.js"}}
-{{/zone}}
+{{/zone}}
\ No newline at end of file
diff --git a/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/public/css/styles.css b/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/public/css/styles.css
new file mode 100644
index 000000000..984c46c7f
--- /dev/null
+++ b/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/public/css/styles.css
@@ -0,0 +1,58 @@
+/*
+ *  Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+.circle {
+    background: none repeat scroll 0 0 #191919;
+    border-radius: 50px;
+    height: 50px;
+    padding: 10px;
+    width: 50px;
+    color: #fff;
+}
+.padding-top-double {
+    padding-top: 20px;
+}
+.padding-double {
+    padding: 20px;
+}
+.grey {
+    color: #333;
+}
+hr {
+    display: block;
+    height: 1px;
+    border: 0;
+    border-top: 1px solid #7f7f7f;
+    margin: 1em 0;
+    padding: 0;
+    opacity: 0.2;
+}
+.light-grey {
+    color: #7c7c7c;
+}
+.uppercase {
+    text-transform: uppercase;
+}
+.grey-bg {
+    background-color: #f6f4f4;
+}
+.doc-link {
+    background: #11375B;
+    padding: 20px;
+    color: white;
+}
+.doc-link a {
+    color: white;
+}
diff --git a/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs b/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs
index 9280cbfb7..921db639f 100644
--- a/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs
+++ b/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs
@@ -289,51 +289,7 @@
 </div>
 
 {{#zone "topCss"}}
-    <style type="text/css">
-        .circle {
-            background: none repeat scroll 0 0 #191919;
-            border-radius: 50px;
-            height: 50px;
-            padding: 10px;
-            width: 50px;
-            color: #fff;
-        }
-        .padding-top-double {
-            padding-top: 20px;
-        }
-        .padding-double {
-            padding: 20px;
-        }
-        .grey {
-            color: #333;
-        }
-        hr {
-            display: block;
-            height: 1px;
-            border: 0;
-            border-top: 1px solid #7f7f7f;
-            margin: 1em 0;
-            padding: 0;
-            opacity: 0.2;
-        }
-        .light-grey {
-            color: #7c7c7c;
-        }
-        .uppercase {
-            text-transform: uppercase;
-        }
-        .grey-bg {
-            background-color: #f6f4f4;
-        }
-        .doc-link {
-            background: #11375B;
-            padding: 20px;
-            color: white;
-        }
-        .doc-link a {
-            color: white;
-        }
-    </style>
+    {{css "css/styles.css"}}
 {{/zone}}
 
 {{#zone "bottomJs"}}
diff --git a/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/public/css/styles.css b/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/public/css/styles.css
new file mode 100644
index 000000000..0c138185a
--- /dev/null
+++ b/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/public/css/styles.css
@@ -0,0 +1,68 @@
+/*
+ *  Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+.circle {
+    background: none repeat scroll 0 0 #191919;
+    border-radius: 50px;
+    height: 50px;
+    padding: 10px;
+    width: 50px;
+    color: #fff;
+}
+
+.padding-top-double {
+    padding-top: 20px;
+}
+
+.padding-double {
+    padding: 20px;
+}
+
+.grey {
+    color: #333;
+}
+
+hr {
+    display: block;
+    height: 1px;
+    border: 0;
+    border-top: 1px solid #7f7f7f;
+    margin: 1em 0;
+    padding: 0;
+    opacity: 0.2;
+}
+
+.light-grey {
+    color: #7c7c7c;
+}
+
+.uppercase {
+    text-transform: uppercase;
+}
+
+.grey-bg {
+    background-color: #f6f4f4;
+}
+
+.doc-link {
+    background: #11375B;
+    padding: 20px;
+    color: white;
+    margin-top: 0;
+}
+
+.doc-link a {
+    color: white;
+}
\ No newline at end of file
diff --git a/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs b/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs
index 68e842b42..52bc44c84 100644
--- a/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs
+++ b/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs
@@ -278,61 +278,7 @@
 </div>
 
 {{#zone "topCss"}}
-    <style type="text/css">
-        .circle {
-            background: none repeat scroll 0 0 #191919;
-            border-radius: 50px;
-            height: 50px;
-            padding: 10px;
-            width: 50px;
-            color: #fff;
-        }
-
-        .padding-top-double {
-            padding-top: 20px;
-        }
-
-        .padding-double {
-            padding: 20px;
-        }
-
-        .grey {
-            color: #333;
-        }
-
-        hr {
-            display: block;
-            height: 1px;
-            border: 0;
-            border-top: 1px solid #7f7f7f;
-            margin: 1em 0;
-            padding: 0;
-            opacity: 0.2;
-        }
-
-        .light-grey {
-            color: #7c7c7c;
-        }
-
-        .uppercase {
-            text-transform: uppercase;
-        }
-
-        .grey-bg {
-            background-color: #f6f4f4;
-        }
-
-        .doc-link {
-            background: #11375B;
-            padding: 20px;
-            color: white;
-            margin-top: 0;
-        }
-
-        .doc-link a {
-            color: white;
-        }
-    </style>
+    {{css "css/styles.css"}}
 {{/zone}}
 
 {{#zone "bottomJs"}}
diff --git a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/public/css/styles.css b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/public/css/styles.css
new file mode 100644
index 000000000..47250fc86
--- /dev/null
+++ b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/public/css/styles.css
@@ -0,0 +1,68 @@
+/*
+ *  Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+.circle {
+    background: none repeat scroll 0 0 #191919;
+    border-radius: 50px;
+    height: 50px;
+    padding: 10px;
+    width: 50px;
+    color: #fff;
+}
+
+.padding-top-double {
+    padding-top: 20px;
+}
+
+.padding-double {
+    padding: 20px;
+}
+
+.grey {
+    color: #333;
+}
+
+hr {
+    display: block;
+    height: 1px;
+    border: 0;
+    border-top: 1px solid #7f7f7f;
+    margin: 1em 0;
+    padding: 0;
+    opacity: 0.2;
+}
+
+.light-grey {
+    color: #7c7c7c;
+}
+
+.uppercase {
+    text-transform: uppercase;
+}
+
+.grey-bg {
+    background-color: #f6f4f4;
+}
+
+.doc-link {
+    background: #11375B;
+    padding: 20px;
+    color: white;
+    margin-top: 0;
+}
+
+.doc-link a {
+    color: white;
+}
diff --git a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs
index 81853ee5d..6a254dd5b 100644
--- a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs
+++ b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs
@@ -250,65 +250,10 @@
 </div>
 
 {{#zone "topCss"}}
-    <style type="text/css">
-        .circle {
-            background: none repeat scroll 0 0 #191919;
-            border-radius: 50px;
-            height: 50px;
-            padding: 10px;
-            width: 50px;
-            color: #fff;
-        }
-
-        .padding-top-double {
-            padding-top: 20px;
-        }
-
-        .padding-double {
-            padding: 20px;
-        }
-
-        .grey {
-            color: #333;
-        }
-
-        hr {
-            display: block;
-            height: 1px;
-            border: 0;
-            border-top: 1px solid #7f7f7f;
-            margin: 1em 0;
-            padding: 0;
-            opacity: 0.2;
-        }
-
-        .light-grey {
-            color: #7c7c7c;
-        }
-
-        .uppercase {
-            text-transform: uppercase;
-        }
-
-        .grey-bg {
-            background-color: #f6f4f4;
-        }
-
-        .doc-link {
-            background: #11375B;
-            padding: 20px;
-            color: white;
-            margin-top: 0;
-        }
-
-        .doc-link a {
-            color: white;
-        }
-
-    </style>
+    {{css "css/styles.css"}}
 {{/zone}}
 
 {{#zone "bottomJs"}}
     {{js "/js/download.js"}}
     {{js "/js/jquery.validate.js"}}
-{{/zone}}
+{{/zone}}
\ No newline at end of file
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/css/styles.css b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/css/styles.css
new file mode 100644
index 000000000..04e2a2611
--- /dev/null
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/css/styles.css
@@ -0,0 +1,61 @@
+/*
+ *  Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+.circle {
+    background: none repeat scroll 0 0 #191919;
+    border-radius: 50px;
+    height: 50px;
+    padding: 10px;
+    width: 50px;
+    color: #fff;
+}
+.padding-top-double {
+    padding-top: 20px;
+}
+.padding-double {
+    padding: 20px;
+}
+.grey {
+    color: #333;
+}
+hr {
+    display: block;
+    height: 1px;
+    border: 0;
+    border-top: 1px solid #7f7f7f;
+    margin: 1em 0;
+    padding: 0;
+    opacity: 0.2;
+}
+.light-grey {
+    color: #7c7c7c;
+}
+.uppercase {
+    text-transform: uppercase;
+}
+.grey-bg {
+    background-color: #f6f4f4;
+}
+
+.doc-link {
+    background: #11375B;
+    padding: 20px;
+    color: white;
+    margin-top: 0;
+}
+
+.doc-link a {
+    color: white;
+}
\ No newline at end of file
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs
index 09c98431b..93e2e0a2f 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs
@@ -79,59 +79,11 @@
 </div>
 
 {{#zone "topCss"}}
-    <style type="text/css">
-        .circle {
-            background: none repeat scroll 0 0 #191919;
-            border-radius: 50px;
-            height: 50px;
-            padding: 10px;
-            width: 50px;
-            color: #fff;
-        }
-        .padding-top-double {
-            padding-top: 20px;
-        }
-        .padding-double {
-            padding: 20px;
-        }
-        .grey {
-            color: #333;
-        }
-        hr {
-            display: block;
-            height: 1px;
-            border: 0;
-            border-top: 1px solid #7f7f7f;
-            margin: 1em 0;
-            padding: 0;
-            opacity: 0.2;
-        }
-        .light-grey {
-            color: #7c7c7c;
-        }
-        .uppercase {
-            text-transform: uppercase;
-        }
-        .grey-bg {
-            background-color: #f6f4f4;
-        }
-
-        .doc-link {
-            background: #11375B;
-            padding: 20px;
-            color: white;
-            margin-top: 0;
-        }
-
-        .doc-link a {
-            color: white;
-        }
-    </style>
+    {{css "css/styles.css"}}
 {{/zone}}
 
 {{#zone "bottomJs"}}
     <script type="text/javascript">
-
         $(".download-link").click(function(){
             toggleEnrollment();
         });
@@ -141,6 +93,5 @@
             generateQRCode(".modalpopup-content .qr-code");
             showPopup();
         }
-
     </script>
 {{/zone}}
\ No newline at end of file
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/gcm/GCMUtil.java b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/gcm/GCMUtil.java
index 19f594bc8..d051b1646 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/gcm/GCMUtil.java
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/gcm/GCMUtil.java
@@ -27,6 +27,7 @@ import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.TenantConfiguration;
 import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
+import org.wso2.carbon.device.mgt.mobile.impl.android.AndroidDeviceManagementService;
 import org.wso2.carbon.device.mgt.mobile.impl.android.util.AndroidPluginConstants;
 import org.wso2.carbon.device.mgt.mobile.internal.MobileDeviceManagementDataHolder;
 
@@ -153,12 +154,12 @@ public class GCMUtil {
     }
 
     public static String getConfigurationProperty(String property) {
-        DeviceManagementService androidDMService = MobileDeviceManagementDataHolder.getInstance().
-                getAndroidDeviceManagementService();
+        DeviceManagementService androidDMService = new AndroidDeviceManagementService();
         try {
             //Get the TenantConfiguration from cache if not we'll get it from DM service
             TenantConfiguration tenantConfiguration = getTenantConfigurationFromCache();
             if (tenantConfiguration == null) {
+                androidDMService.init();
                 tenantConfiguration = androidDMService.getDeviceManager().getConfiguration();
                 if (tenantConfiguration != null) {
                     addTenantConfigurationToCache(tenantConfiguration);
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/public/css/styles.css b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/public/css/styles.css
new file mode 100644
index 000000000..04e2a2611
--- /dev/null
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/public/css/styles.css
@@ -0,0 +1,61 @@
+/*
+ *  Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+.circle {
+    background: none repeat scroll 0 0 #191919;
+    border-radius: 50px;
+    height: 50px;
+    padding: 10px;
+    width: 50px;
+    color: #fff;
+}
+.padding-top-double {
+    padding-top: 20px;
+}
+.padding-double {
+    padding: 20px;
+}
+.grey {
+    color: #333;
+}
+hr {
+    display: block;
+    height: 1px;
+    border: 0;
+    border-top: 1px solid #7f7f7f;
+    margin: 1em 0;
+    padding: 0;
+    opacity: 0.2;
+}
+.light-grey {
+    color: #7c7c7c;
+}
+.uppercase {
+    text-transform: uppercase;
+}
+.grey-bg {
+    background-color: #f6f4f4;
+}
+
+.doc-link {
+    background: #11375B;
+    padding: 20px;
+    color: white;
+    margin-top: 0;
+}
+
+.doc-link a {
+    color: white;
+}
\ No newline at end of file
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/type-view.hbs b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/type-view.hbs
index 1c310bdf2..638a5e26d 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/type-view.hbs
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/type-view.hbs
@@ -16,7 +16,7 @@
   under the License.
 }}
 <div class="col-lg-12  margin-top-double">
-    <h1 class="grey ">Windows Mobile</h1>
+    <h1 class="grey">Windows Mobile</h1>
     <hr>
 </div>
 <div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 padding-top">
@@ -24,28 +24,26 @@
 </div>
 
 <div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
-    <h4 class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS100/Windows"
-                                  target="_blank">[ here ]</a> for latest instructions and troubleshooting.</h4>
+    <h4 class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS100/Windows" target="_blank">[ here ]</a> for
+                         latest instructions and troubleshooting.</h4>
 </div>
 
 <div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
 
     <h3 class="uppercase">What it Does</h3>
-    <hr>
+    <hr />
     <p class="grey margin-top">Connect and manage your Windows device with WSO2 IoT Server.</p>
     <br>
 
     <h3 class="uppercase">What You Need</h3>
     <hr>
     <ul class="list-unstyled">
-        <li class="padding-top-double"><span class="circle">STEP 01</span>&nbsp;&nbsp;&nbsp;Windows
-                                                                          Mobile.
-        </li>
-        <li class="padding-top-double"><span class="circle">STEP 02</span>&nbsp;&nbsp;&nbsp;Go ahead
-                                                                          and click [Enroll Device].
+        <li class="padding-top-double"><span class="circle">STEP 01</span>&nbsp;&nbsp;&nbsp;Windows Mobile.</li>
+        <li class="padding-top-double"><span class="circle">STEP 02</span>&nbsp;&nbsp;&nbsp;Go ahead and click [Enroll
+                                                                          Device].
         </li>
-        <li class="padding-top-double"><span class="circle">STEP 03</span>&nbsp;&nbsp;&nbsp;Proceed
-                                                                          to [Prepare] section.
+        <li class="padding-top-double"><span class="circle">STEP 03</span>&nbsp;&nbsp;&nbsp;Proceed to [Prepare]
+                                                                          section.
         </li>
     </ul>
     <br>
@@ -53,7 +51,7 @@
     <a href="#" class="download-link btn-operations"><i class="fw fw-mobile fw-inverse fw-lg"></i>
         Enroll Device</a>
 
-    <br/><br/>
+    <br /><br />
 </div>
 
 <div class="col-xs-12 col-sm-12 col-md-8 col-lg-12 padding-double grey-bg">
@@ -61,11 +59,8 @@
     <hr>
     <ul class="list-unstyled">
         <li class="padding-top-double"><span class="circle">01</span> Scan QR code.</li>
-        <li class="padding-top-double"><span class="circle">02</span> Follow instructions in wizard.
-        </li>
-        <li class="padding-top-double"><span class="circle">03</span> Configure your workspace
-                                                                      account
-        </li>
+        <li class="padding-top-double"><span class="circle">02</span> Follow instructions in wizard.</li>
+        <li class="padding-top-double"><span class="circle">03</span> Configure your workspace account</li>
     </ul>
     <br>
 
@@ -80,12 +75,12 @@
     </center>
 </div>
 
-<br/>
+<br />
 
 <div id="qr-code-modal"
      data-enrollment-url="{{@app.context}}/device/windows/enroll" class="hidden">
 
-<div class="content">
+    <div class="content">
         <div class="row">
             <div class="col-lg-5 col-md-6 col-centered">
                 <h3>Scan QR code to start enrollment</h3>
@@ -100,60 +95,8 @@
     </div>
 </div>
 
-{{#zone "topCss"}}
-    <style type="text/css">
-        .circle {
-            background: none repeat scroll 0 0 #191919;
-            border-radius: 50px;
-            height: 50px;
-            padding: 10px;
-            width: 50px;
-            color: #fff;
-        }
-        .padding-top-double {
-            padding-top: 20px;
-        }
-        .padding-double {
-            padding: 20px;
-        }
-        .grey {
-            color: #333;
-        }
-        hr {
-            display: block;
-            height: 1px;
-            border: 0;
-            border-top: 1px solid #7f7f7f;
-            margin: 1em 0;
-            padding: 0;
-            opacity: 0.2;
-        }
-        .light-grey {
-            color: #7c7c7c;
-        }
-        .uppercase {
-            text-transform: uppercase;
-        }
-        .grey-bg {
-            background-color: #f6f4f4;
-        }
-
-        .doc-link {
-            background: #11375B;
-            padding: 20px;
-            color: white;
-            margin-top: 0;
-        }
-
-        .doc-link a {
-            color: white;
-        }
-    </style>
-{{/zone}}
-
 {{#zone "bottomJs"}}
     <script type="text/javascript">
-
         $(".download-link").click(function () {
             toggleEnrollment();
         });
@@ -163,6 +106,9 @@
             generateQRCode(".modalpopup-content .qr-code");
             showPopup();
         }
-
     </script>
+{{/zone}}
+
+{{#zone "topCss"}}
+    {{css "css/styles.css"}}
 {{/zone}}
\ No newline at end of file
diff --git a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/p2.inf b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/p2.inf
index 9c79e2fbd..349c09785 100644
--- a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/p2.inf
+++ b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/p2.inf
@@ -1,6 +1,5 @@
 instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.android_${feature.version}/webapps/,target:${installFolder}/../../deployment/server/webapps/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.android_${feature.version}/webapps/mdm-android-agent.war,target:${installFolder}/../../deployment/server/webapps/mdm-android-agent.war,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.android_${feature.version}/jaggeryapps/,target:${installFolder}/../../deployment/server/jaggeryapps/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.android_${feature.version}/conf/mobile-config.xml,target:${installFolder}/../../conf/mobile-config.xml,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.android_${feature.version}/dbscripts/plugins/,target:${installFolder}/../../../dbscripts/cdm/plugins/android,overwrite:true);\