6 files changed, 16 insertions, 2 deletions
diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index d9cce18..48ada6c 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -109,6 +109,7 @@ Scenery.resize = new function(){
 	}
 
 	base.hide = function () {
+	  if (! obj) return
 		obj = null
 		dots.forEach(function(dot){
 			scene.remove(dot)
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index 5e0da7e..c631317 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -56,6 +56,11 @@ var EditorToolbar = View.extend({
 		$(".inuse").removeClass("inuse")
 		$("[data-role='resize-media']").toggleClass("inuse", state)
 		if (state) {
+			if (this.parent.mediaEditor.scenery) {
+        Scenery.resize.show( this.parent.mediaEditor.scenery )
+      }
+		}
+		else {
 			Scenery.resize.hide()
 		}
 	},
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index b75a912..e11f189 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -33,7 +33,6 @@ var EditorView = View.extend({
 		$("#map").hide()
 		
 		this.settings.load(data)
-		this.collaborators.show()
 	},
 	
 	readyLayout: function(data){
diff --git a/public/assets/javascripts/ui/editor/MediaEditor.js b/public/assets/javascripts/ui/editor/MediaEditor.js
index cc924da..f1ded50 100644
--- a/public/assets/javascripts/ui/editor/MediaEditor.js
+++ b/public/assets/javascripts/ui/editor/MediaEditor.js
@@ -137,11 +137,13 @@ var MediaEditor = FormView.extend({
 	bind: function(scenery){
 		this.scenery = scenery
 		this.scenery.mx.bound = true
+		this.scenery.mx.el.classList.add("picked")
 	},
 	
 	unbind: function(){
 	  if (this.scenery && this.scenery.mx) {
       this.scenery.mx.bound = false
+      this.scenery.mx.el.classList.remove("picked")
     }
     this.scenery = null
 	},
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index f59635b..b1be797 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -544,6 +544,13 @@ iframe.embed {
 .mx-scenery {
   cursor: pointer;
 }
+.editing .mx-scenery:hover,
+.editing .mx-scenery.picked {
+  border: 1px dashed #000;
+  -moz-box-sizing: content-box;
+  -webkit-box-sizing: content-box;
+  box-sizing: content-box;
+}
 .mx-scenery:active {
   cursor: pointer;
 }
diff --git a/views/reader.ejs b/views/reader.ejs
index 7c31766..ed5df1f 100644
--- a/views/reader.ejs
+++ b/views/reader.ejs
@@ -4,7 +4,7 @@
 	<title>vvalls</title>
 	[[ include partials/meta ]]
 </head>
-<body class="editing loading">
+<body class="loading">
 
 	<div id="scene"></div>