diff --git a/app/assets/javascripts/app/pages/framer.js b/app/assets/javascripts/app/pages/framer.js
index 52afcfc57ee40eee5b1d10133c15279637bf5c9b..8247127b5026b786cf645a45fc63da3e0b4ddc43 100644
--- a/app/assets/javascripts/app/pages/framer.js
+++ b/app/assets/javascripts/app/pages/framer.js
@@ -43,9 +43,16 @@ app.views.framerControls = app.views.Base.extend({
   },
 
   saveFrame : function(){
-    //how do we make this work for the not
+    this.$('button').prop('disabled', 'disabled')
+    // this is gross hack to make this action work in the iframe version and not iframe version.
+    var callback = {}
     var parentDoc = parent;
-    this.model.save({}, {success : function(){ parentDoc.closeIFrame() }})
+
+    if(parentDoc.location.pathname != '/framer'){
+      callback = {success : function(){ parentDoc.closeIFrame() }}
+    }
+
+    this.model.save({}, callback)
   }
 });
 
diff --git a/app/assets/stylesheets/new_styles/_base.scss b/app/assets/stylesheets/new_styles/_base.scss
index e75d9d8660f2e4764153cd920e19fa12a52d2508..b3c77882644903a9ea6456fb9b7142d44ce2e755 100644
--- a/app/assets/stylesheets/new_styles/_base.scss
+++ b/app/assets/stylesheets/new_styles/_base.scss
@@ -426,10 +426,11 @@ div[data-template=flow] {
 
   a.mood {
     @include border-radius();
-    margin-right: 20px;
-    padding: 5px;
+    margin-right: 11px;
+    padding: 7px;
     color: #999;
-    font-size: 20px;
+    font-size: 14px;
+    line-height: 2em;
 
     &#selected_mood {
       background-color: #222;
diff --git a/app/assets/templates/composer-controls.jst.hbs b/app/assets/templates/composer-controls.jst.hbs
index a7911c0feeae1c584c5434c0ca99b366e342deac..5efb7301d5fc447cfa85e925b575ecc2ae0cac81 100644
--- a/app/assets/templates/composer-controls.jst.hbs
+++ b/app/assets/templates/composer-controls.jst.hbs
@@ -2,4 +2,4 @@
   <button class="done btn-primary next">Next</button>
   <div class="aspect-selector"/>
   <div class="service-selector"/>
-</div>
+</div>
\ No newline at end of file
diff --git a/app/assets/templates/framer-controls.jst.hbs b/app/assets/templates/framer-controls.jst.hbs
index f2178be791ba3a6cffbd92a26c61c93ba169a9fa..638a06e8e9ace7d3f8712d76ab2a64d1dec637b2 100644
--- a/app/assets/templates/framer-controls.jst.hbs
+++ b/app/assets/templates/framer-controls.jst.hbs
@@ -1,2 +1,4 @@
-<button class="done btn-primary">done</button>
-<div class='template-picker'></div>
+<div id='controls-wrapper'>
+  <button class="done btn-primary">done</button>
+  <div class='template-picker'></div>
+</div>
\ No newline at end of file