diff --git a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/public/js/download.js b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/public/js/download.js
index ec7a6f642a..deb75915e9 100644
--- a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/public/js/download.js
+++ b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/public/js/download.js
@@ -56,14 +56,6 @@ function showPopup() {
             deviceType = this.value;
         }
     });
-    if (deviceType == 'virtual_firealarm'){
-        $('.sketchType').remove();
-        $('input[name="sketchType"][value="virtual_firealarm"]').prop('checked', true);
-        $("label[for='virtual_firealarm']").text("Simple Agent");
-        $("label[for='virtual_firealarm_advanced']").text("Advanced Agent");
-    }else{
-        $('.sketchTypes').remove();
-    }
 }
 
 /*
diff --git a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs
index dfaf576d3a..cedf91ba2a 100644
--- a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs
+++ b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs
@@ -38,60 +38,37 @@
     <div id="download-device-modal-content" class="hide">
         <div class="modal-content">
             <div class="row">
-                <div class="col-md-7 col-centered center-container">
-                    <h3>Name your device and download the agent from following link.</h3>
+                <div class="col-md-7  center-container">
+                    <h3>Name your device and download the agent from following link.dsfsdfdsf</h3>
                     <br/>
                     <form id="downloadForm" method="GET" action="{{@app.context}}/api/devices/sketch/download">
-                    <div class="control-group">
-                        <div class="controls">
-                            <input class="new-device-name" style="color:#3f3f3f;padding:5px"
-                                   type="text"
-                                   placeholder="Ex. Lobby_Firealarm"
-                                   name="deviceName" size="60" required>
-                            <br/>
-                            <input type="hidden" class="deviceType" name="deviceType"
-                                   value="virtual_firealarm"/>
-                            <input type="hidden" class="sketchType" name="sketchType"
-                                   value="virtual_firealarm"/>
-                            <div class="sketchTypes" style="  padding-top: 20px; padding-bottom: 5px; font-size: 18px;">
-                                    <input type="radio" name="sketchType" id="virtual_firealarm"
-                                           value="virtual_firealarm"><label for="virtual_firealarm">virtual_firealarm</label>
+                        <div class="control-group">
+                            <div class="controls">
+                                <input class="new-device-name" style="color:#3f3f3f;padding:5px"
+                                       type="text"
+                                       placeholder="Ex. Lobby_Firealarm"
+                                       name="deviceName" size="60" required>
+                                <br/><br/>
+                                <input type="hidden" class="deviceType" name="deviceType" value="virtual_firealarm"/>
+                                <input type="radio" name="sketchType" value="simple_agent" id="simple_agent"> <label for="simple_agent">Simple Agent</label> &nbsp;&nbsp;
+                                <input type="radio" name="sketchType" value="advanced_agent" id="advanced_agent"> <label for="advanced_agent">Advanced Agent</label>
                             </div>
                         </div>
-                    </div>
-                    <br/>
-
-                    <div class="buttons">
-                        <a class="btn-operations" onclick="downloadAgent()">Download
-                            Now</a>
-                        &nbsp;&nbsp;
-                        <a href="#" id="download-device-download-link" class="blue-button">
-                            &nbsp;&nbsp;&nbsp;&nbsp;Copy Link&nbsp;&nbsp;&nbsp;&nbsp;
-                        </a>
-                        &nbsp;&nbsp;
-                    </div>
+                        <div class="buttons" style="padding-bottom: 0px">
+                            <a class="btn btn-operations" onclick="downloadAgent()">Download
+                                Now</a>
+                            &nbsp;&nbsp;
+                            <a href="#" id="download-device-download-link" class="btn btn-operations">
+                                &nbsp;&nbsp;&nbsp;&nbsp;Copy Link&nbsp;&nbsp;&nbsp;&nbsp;
+                            </a>
+                            &nbsp;&nbsp;
+                        </div>
                 </form>
                 </div>
             </div>
         </div>
     </div>
 
-    <div id="download-device-modal-content-links" class="hide">
-        <div class="modal-content">
-            <div class="row">
-                <div class="col-md-7 col-centered center-container">
-                    <h3>Please download the file from following link(Press CTRL+C).</h3>
-                    <br/>
-
-                    <div>
-                        <input id="download-device-url" style="color:#3f3f3f;padding:5px"
-                               type="text" value="" placeholder="Type here" size="60">
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
     <div id="device-400-content" class="hide">
         <div class="modal-content">
             <div class="row">
@@ -237,43 +214,46 @@
     </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;
-    }
-</style>
+
+{{#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;
+        }
+    </style>
+{{/zone}}
 
 {{#zone "bottomJs"}}
     {{js "/js/download.js"}}
@@ -288,7 +268,7 @@
         function toggleEnrollment(){
             $(".modalpopup-content").html($("#qr-code-modal").html());
             //generateQRCode(".modalpopup-content .qr-code");
-            showPopup();
+            //showPopup();
         }
 
     </script>