diff --git a/public/modules/core/css/github-fork-ribbon.css b/public/modules/core/css/github-fork-ribbon.css
index e1462e57..0326f455 100644
--- a/public/modules/core/css/github-fork-ribbon.css
+++ b/public/modules/core/css/github-fork-ribbon.css
@@ -57,7 +57,8 @@
   position: absolute;
   overflow: hidden;
   top: 0;
-  z-index: 9999;
+  z-index: 9998;
+
   pointer-events: none;
 }
 
diff --git a/public/modules/forms/controllers/admin-form.client.controller.js b/public/modules/forms/controllers/admin-form.client.controller.js
index 53aec631..5b6eaa1e 100644
--- a/public/modules/forms/controllers/admin-form.client.controller.js
+++ b/public/modules/forms/controllers/admin-form.client.controller.js
@@ -56,7 +56,6 @@ angular.module('forms').controller('AdminFormController', ['$rootScope', '$scope
         ** DeleteModal Functions 
         */
         $scope.openDeleteModal = function(){
-            console.log('hello');
             $scope.deleteModal = $uibModal.open({
               animation: $scope.animationsEnabled,
               templateUrl: 'myModalContent.html',
diff --git a/public/modules/forms/css/form.css b/public/modules/forms/css/form.css
index 6e739caf..0e03e1f5 100644
--- a/public/modules/forms/css/form.css
+++ b/public/modules/forms/css/form.css
@@ -4,6 +4,27 @@
     border-width:3px;
 }
 
+.busy-updating-wrapper {
+   text-align: center; 
+   font-size: 20px;
+   position: fixed; 
+   bottom: 0; 
+   right: 55px;
+   z-index: 1;
+}
+
+.busy-updating-wrapper .message {
+    text-align: center; 
+    font-size: 20px;
+    position: fixed; 
+    bottom: 0; 
+    right: 70px; 
+    background-color: gray; 
+    color: white; 
+    padding: 5px 15px 5px 10px; 
+    z-index: 9999;
+}
+
 section.public-form {
     margin-top: -70px;
 }
diff --git a/public/modules/forms/views/admin-form.client.view.html b/public/modules/forms/views/admin-form.client.view.html
index 0fc3150f..74664be9 100644
--- a/public/modules/forms/views/admin-form.client.view.html
+++ b/public/modules/forms/views/admin-form.client.view.html
@@ -1,4 +1,6 @@
-<section class="container admin-form" cg-busy="{promise:updatePromise,templateUrl:'modules/forms/views/directiveViews/cgBusy/update-form-message-TypeB.html',message:'Updating form...',backdrop:false}">
+<div class="container" cg-busy="{promise:updatePromise,templateUrl:'modules/forms/views/directiveViews/cgBusy/update-form-message-TypeB.html',message:'Updating form...', backdrop:false, wrapperClass:'.busy-updating-wrapper'}"></div>
+
+<section class="container admin-form">
 
 	<!-- Modal Delete Dialog Template -->
     <script type="text/ng-template" id="myModalContent.html">
@@ -64,96 +66,6 @@
 	</div>
 
 	<div class="row">
-		<!-- <tabset class="col-xs-12">
-			<tab>
-				<tab-heading>
-					Edit Form Fields
-				</tab-heading>
-				<edit-form-directive myform="myform">
-				</edit-form-directive>
-			</tab>
-			<tab>
-				<tab-heading >
-					Design
-				</tab-heading>
-				<div class="config-form container">
-					Design Settings
-					<div class="row">
-				        <div class="col-md-12 container">
-				        	Title
-				            <div class="row">
-				                <div class="col-sm-12">
-				                    <h2 class="hidden-sm hidden-xs">Change how your Form Looks</h2>
-				                    <h3 class="hidden-lg hidden-md">Change how your Form Looks</h3>
-				                </div>
-				            </div>
-
-				            Background Color
-				            <div class="row field">
-				                <div class="field-title col-sm-6">
-				                    <h5>Form Background Color</h5>
-				                </div>
-
-				                <div class="field-input col-sm-6">
-
-				                    <input colorpicker="hex" type="text" ng-model="myform.design.colors.backgroundColor" ng-style="{ 'background-color': myform.design.colors.backgroundColor }"/>
-				                </div>
-				            </div>
-
-				            Question Color
-				            <div class="row field">
-				                <div class="field-title col-sm-6">
-				                    <h5>Question Color</h5>
-				                </div>
-
-				                <div class="field-input col-sm-6">
-
-				                    <input colorpicker="hex" type="text" ng-model="myform.design.colors.questionColor" ng-style="{ 'background-color': myform.design.colors.questionColor }"/>
-
-
-				                </div>
-				            </div>
-
-				            Answer Color
-				            <div class="row field">
-				                <div class="field-title col-sm-6">
-				                    <h5>Form Answer Color</h5>
-				                </div>
-
-				                <div class="field-input col-sm-6">
-
-				                    <input colorpicker="hex" type="text" ng-model="myform.design.colors.answerColor" ng-style="{ 'background-color': myform.design.colors.answerColor }"/>
-
-				                </div>
-				            </div>
-				        </div>
-				    </div>
-
-					<div class="row">
-			            <div class="col-sm-offset-4 col-sm-2">
-			                <button class="btn btn-primary btn-large" type="button" ng-click="update(false, null)"><i class="icon-arrow-left icon-white"></i> Save Changes</button>
-			            </div>
-			            <div class="col-sm-1">
-			                <button class="btn btn-default" type="button" ng-click="resetForm()"><i class="icon-eye-open icon-white"></i> Cancel</button>
-			            </div>
-			    	</div>
-            	</div>
-			</tab>
-			<tab>
-				<tab-heading>
-					Configure
-				</tab-heading>
-				<configure-form-directive myform="myform" user="user">
-				</configure-form-directive>
-			</tab>
-			<tab>
-				<tab-heading>
-					View Submissions
-				</tab-heading>
-				<edit-submissions-form-directive myform="myform" user="user">
-				</edit-submissions-form-directive>
-			</tab>
-		</tabset> -->
 		<div class="col-xs-12">
 			<!-- <tabset> -->
 			<tabs data="tabData"></tabs>
diff --git a/public/modules/forms/views/directiveViews/cgBusy/update-form-message-TypeB.html b/public/modules/forms/views/directiveViews/cgBusy/update-form-message-TypeB.html
index 8b9787aa..714ff288 100644
--- a/public/modules/forms/views/directiveViews/cgBusy/update-form-message-TypeB.html
+++ b/public/modules/forms/views/directiveViews/cgBusy/update-form-message-TypeB.html
@@ -1,4 +1,4 @@
 <!-- cgBusy Template -->
 <div>
-	<div style="text-align: center; font-size: 20px;position: fixed; bottom: 0; right: 45px; background-color: gray; color: white; padding: 5px 15px 5px 10px; z-index: 10;">{{$message}}</div>
+	<div style="text-align: center; font-size: 20px;position: fixed; bottom: 0; right: 55px; background-color: gray; color: white; padding: 5px 15px 5px 10px; z-index: 10;">{{$message}}</div>
 </div> 
\ No newline at end of file
diff --git a/public/modules/forms/views/directiveViews/field/yes_no.html b/public/modules/forms/views/directiveViews/field/yes_no.html
index eaed2d9a..811d8930 100644
--- a/public/modules/forms/views/directiveViews/field/yes_no.html
+++ b/public/modules/forms/views/directiveViews/field/yes_no.html
@@ -1,4 +1,4 @@
-setActiveField(field._id, index)<div class="field row radio" ng-click="setActiveField(field._id, index)">
+<div class="field row radio" ng-click="setActiveField(field._id, index)">
     <div class="col-xs-12 field-title" ng-style="{'color': design.colors.questionColor}">
         <h3 class="row">
             <span class="fa fa-angle-double-right"></span> {{field.title}}