diff --git a/activities/Record.activity/index.html b/activities/Record.activity/index.html
index b263b5647..cd34ad02d 100644
--- a/activities/Record.activity/index.html
+++ b/activities/Record.activity/index.html
@@ -31,22 +31,9 @@
     <img id="loading-stop" src="icons/stop.svg">
 
     <div style="text-align: center;">
-        <svg id="loading-svg" version="1.1" xmlns="http://www.w3.org/2000/svg"  x="0px" y="0px"
-   width="40px" height="40px" viewBox="0 0 40 40" enable-background="new 0 0 40 40" xml:space="preserve">
-  <path opacity="0.2" fill="#000" d="M20.201,5.169c-8.254,0-14.946,6.692-14.946,14.946c0,8.255,6.692,14.946,14.946,14.946
-    s14.946-6.691,14.946-14.946C35.146,11.861,28.455,5.169,20.201,5.169z M20.201,31.749c-6.425,0-11.634-5.208-11.634-11.634
-    c0-6.425,5.209-11.634,11.634-11.634c6.425,0,11.633,5.209,11.633,11.634C31.834,26.541,26.626,31.749,20.201,31.749z"/>
-  <path fill="#000" d="M26.013,10.047l1.654-2.866c-2.198-1.272-4.743-2.012-7.466-2.012h0v3.312h0
-    C22.32,8.481,24.301,9.057,26.013,10.047z">
-    <animateTransform attributeType="xml"
-      attributeName="transform"
-      type="rotate"
-      from="0 20 20"
-      to="360 20 20"
-      dur="1s"
-      repeatCount="indefinite"/>
-    </path>
-  </svg>
+       <center>
+           <video id="vidDisplay" autoplay="true">No video Support</video>
+       </center>
         <br/>
         <span id="timer-start"></span>
         <progress id="loading-progress" style="width:80%; display:inline-block;" max="30" value="0"></progress>
@@ -55,7 +42,6 @@
 </div>
 
 <div id="records"></div>
-
 </body>
 
 </html>
diff --git a/activities/Record.activity/js/activity.js b/activities/Record.activity/js/activity.js
index 85a0c271c..9166f7c58 100644
--- a/activities/Record.activity/js/activity.js
+++ b/activities/Record.activity/js/activity.js
@@ -35,16 +35,33 @@ define(["sugar-web/activity/activity","sugar-web/presence","activity/capture-hel
         var photoButton = document.getElementById("photo-button");
         var audioButton = document.getElementById("audio-button");
         var videoButton = document.getElementById("video-button");
+        var vidDisplay = document.getElementById("vidDisplay");
+
+        function handleVideo(stream){
+            document.querySelector('#vidDisplay').srcObject = stream;
+        }
+        function videoError(e){
+            alert("There was some error");
+        }
 
         photoButton.addEventListener("click", function () {
             captureHelper.helper.takePicture();
+            if(vidDisplay.style.display == "none"){
+                vidDisplay.style.display = "block" ;
+            }
         });
 
         audioButton.addEventListener("click", function () {
+            if(vidDisplay.style.display != "none"){
+                vidDisplay.style.display = "none" ;
+            }
             captureHelper.helper.recordAudio();
         });
 
         videoButton.addEventListener("click", function () {
+            if(vidDisplay.style.display == "none"){
+                vidDisplay.style.display = "block" ;
+            }
             captureHelper.helper.recordVideo();
         });
 
diff --git a/activities/Record.activity/js/capture-helper.js b/activities/Record.activity/js/capture-helper.js
index b1e5dadd6..042985067 100644
--- a/activities/Record.activity/js/capture-helper.js
+++ b/activities/Record.activity/js/capture-helper.js
@@ -498,7 +498,7 @@ define(["activity/recordrtc", "sugar-web/activity/activity", "sugar-web/datastor
                         quality: 0
                     });
 
-
+                    document.querySelector('#vidDisplay').srcObject = mediaStream;
                     recordRTC.startRecording();
                     var maxTime = 5;
                     t.currentRecording.time = 0;
@@ -561,6 +561,7 @@ define(["activity/recordrtc", "sugar-web/activity/activity", "sugar-web/datastor
                 navigator.getUserMedia({video: true}, function (mediaStream) {
                     var recordRTC = RecordRTC(mediaStream, {type: 'video'});
                     recordRTC.startRecording();
+                    document.querySelector('#vidDisplay').srcObject = mediaStream;
                     setTimeout(function () {
                         t.timerStart.innerHTML = "";
                         t.timerEnd.innerHTML = "";
diff --git a/package.json b/package.json
old mode 100644
new mode 100755