merge

17 files changed, 211 insertions, 95 deletions

diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs
index 8b133a5..fdf95a7 100644
--- a/views/controls/editor/light-control.ejs
+++ b/views/controls/editor/light-control.ejs
@@ -1,40 +1,40 @@
 <div class="vvbox lightcontrol">
+	<h4>Edit Room Colors</h4>
   <div id="color-picker">
   </div>
   
 	<div class="slider">
-		<h4>Brightness Control</h4>
 		<input type="range" min="0" max="110" value="0" id="brightness-control" />
 	</div>
 
   <div class="color-swatches">
-	<span>
-    <div class="swatch" id="wall-color" data-mode="wall"></div><label>wall</label>
-	</span>
-	<span class="active">
-    <div class="swatch" id="floor-color" data-mode="floor"></div><label>floor</label>
-	</span>
-	<span>
-    <div class="swatch" id="ceiling-color" data-mode="ceiling"></div><label>ceiling</label>
-	</span>
-	<span>
-    <div class="swatch" id="outline-color" data-mode="outline"></div><label>outlines</label>
-	</span>
-	<span>
+    <span>
+      <div class="swatch" id="wall-color" data-mode="wall"></div><label>wall</label>
+    </span>
+    <span class="active">
+      <div class="swatch" id="floor-color" data-mode="floor"></div><label>floor</label>
+    </span>
+    <span>
+      <div class="swatch" id="ceiling-color" data-mode="ceiling"></div><label>ceiling</label>
+    </span>
+    <span>
+      <div class="swatch" id="outline-color" data-mode="outline"></div><label>outlines</label>
+    </span>
   </div>
 
-<!--
-	<div class="slider">
-		<input type="range" min="0" max="100" value="100" id="wall-hue" />
-		<h4>Wall Hue</h4>
-	</div>
-	<div class="slider">
-		<input type="range" min="0" max="100" value="0" id="brightness-control" />
-		<h4>Brightness</h4>
-	</div>
-	<div class="slider">
-		<input type="range" min="0" max="100" value="0" id="shadow-control" />
-		<h4>Shadow</h4>
-	</div>
--->
+  <h4>Preset Styles</h4>
+  <div class="color-swatches defaults">
+    <span>
+      Wireframe
+    </span>
+    <span>
+      Shaded
+    </span>
+    <span>
+      P.Funk
+    </span>
+    <span>
+      SeaPunk
+    </span>
+  </div>
 </div>
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index d73a3ef..3d95fb9 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -17,46 +17,11 @@
 <div class="mediaDrawer fixed animate mediaViewer">
 	<span class="close">X</span>
 	<h2><a href="#" class="userToggle active">Your Media</a> – <a href="#" class="foundToggle">Found Media</a></h2><br>
-	<h3 class="editBtn warn" id="deleteMedia">delete media?</h3>
+	<h3 class="editBtn warn" id="deleteMedia"></h3>
+
 	<div class="myMedia">
 	</div>
 	
 	<div class="foundMedia">
-		<span class="mediaContainer">
-			<img src="https://d1ycxz9plii3tb.cloudfront.net/post_images/52ec0e20c9dc24f1d8000067/large.jpg">
-		</span>
-		<span class="mediaContainer">
-			<img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/4e6bf67bc23f490001004579/1/tall.jpg">
-		</span>
-		<span class="mediaContainer">
-			<img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/52dcca28139b2135030002a8/tall.jpg">
-		</span>
-		<span class="mediaContainer">
-			<img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/52927bb2b202a3669d000704/larger.jpg">
-		</span>
-		<span class="mediaContainer">
-			<img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/4f9f3a3ce262e60001000fb3/large.jpg">
-		</span>
-		<span class="mediaContainer">
-			<img src="http://2.bp.blogspot.com/-GD6IxUvsdOo/UdrcMFLVYNI/AAAAAAAAF2E/kbRfxMxiUlQ/s1600/okeeffe.jpg">
-		</span>
-		<span class="mediaContainer">
-			<img src="http://www.bobkessel.com/wordpress/wp-content/uploads/2009/10/moma-bob-kessel-410.jpg">
-		</span>
-		<span class="mediaContainer">
-			<img src="http://static1.artsy.net/partner_show_images/52f28f348b3b81f2fc000364/large.jpg">
-		</span>
-		<span class="mediaContainer">
-			<img src="http://static3.artsy.net/partner_show_images/52e83674c9dc24397f0000d8/large.jpg">
-		</span>
-		<span class="mediaContainer">
-			<img src="http://static0.artsy.net/partner_show_images/52d96d484b84801ef0000273/large.jpg">
-		</span>
-		<span class="mediaContainer">
-			<img src="http://static1.artsy.net/partner_show_images/52778616275b24f95c00011d/1/large.jpg">
-		</span>
-		<span class="mediaContainer">
-			<img src="http://static1.artsy.net/partner_show_images/52dc65311a1e86be6b000205/large.jpg">
-		</span>
 	</div>
 </div>
\ No newline at end of file
diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs
index 000e8db..305a602 100644
--- a/views/controls/editor/media-editor.ejs
+++ b/views/controls/editor/media-editor.ejs
@@ -1,4 +1,5 @@
 <div class="vvbox settings" id="mediaEditor">
+	<h4>Media Settings</h4>
 	<input type="hidden" name="_csrf" value="[[- token ]]">
 	<input type="hidden" name="_id" value="new">
 
@@ -42,6 +43,7 @@
 		<label for="scenery-height">height</label>
 		<input type="text" class="units" name="height" id="scenery-height">
 	</div>
+	<!--
 	<div class="setting number">
 		<select id="builder-units" name="units">
 			<option value="px">pixels</option>
@@ -49,8 +51,8 @@
 			<option value="m">meter</option>
 		</select>
 	</div>
-
+	-->
 	<div class="setting">
-		<a href="#" class="warn btn" data-role="destroy-media">delete this media</a>
+		<a href="#" class="warn btn" data-role="destroy-media">remove from wall</a>
 	</div>
 </div>
diff --git a/views/controls/editor/settings.ejs b/views/controls/editor/settings.ejs
index ed587fa..ad62b55 100644
--- a/views/controls/editor/settings.ejs
+++ b/views/controls/editor/settings.ejs
@@ -1,4 +1,5 @@
 <div class="vvbox settings" id="editorSettings">
+	<h4>Room Settings</h4>
 	<input type="hidden" name="_csrf" value="[[- token ]]">
 	<input type="hidden" name="_id" value="new">
 
diff --git a/views/controls/editor/signed-out.ejs b/views/controls/editor/signed-out.ejs
index 20e3715..118fb7c 100644
--- a/views/controls/editor/signed-out.ejs
+++ b/views/controls/editor/signed-out.ejs
@@ -8,7 +8,7 @@
 </div>
 
 <div class="share">
-	<h2>Share this on–</h2>
+	<h2>Share on–</h2>
 	<a href="#">Facebook</a>
 	<a href="#">Twitter</a>
 </div>
diff --git a/views/controls/editor/text-editor.ejs b/views/controls/editor/text-editor.ejs
new file mode 100644
index 0000000..205fbdf
--- /dev/null
+++ b/views/controls/editor/text-editor.ejs
@@ -0,0 +1,32 @@
+<div class="vvbox settings" id="textEditor">
+	<h4>Edit Text</h4>
+  
+	<div class="setting">
+    <select name="font-family">
+      <option>Helvetica</option>
+      <option>Times New Roman</option>
+      <option>Lato</option>
+      <option></option>
+    </select>
+    <select name="font-size">
+      <option value="9">9pt</option>
+      <option value="10">10pt</option>
+      <option value="12">12pt</option>
+      <option value="16">16pt</option>
+      <option value="24">24pt</option>
+      <option value="36">36pt</option>
+      <option value="72">72pt</option>
+    </select>
+  </div>
+  
+	<div class="setting">
+	  <textarea name="text-body"></textarea>
+  </div>
+  
+	<div class="setting">
+		<a href="#" class="warn btn" data-role="destroy-text">remove from wall</a>
+	</div>
+</div>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index 4abf780..92807e1 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -3,6 +3,7 @@
 		data-role='open-media-viewer'
 		data-info="add media"
 		class="icon-ios7-photos-outline"></span>
+<!-- 
 	<span
 		data-role='resize-media'
 		data-info="resize media"
@@ -12,6 +13,11 @@
 		data-info="delete media"
 		class="icon-ios7-trash-outline"></span>
 	<span
+		data-role='toggle-text-editor'
+		data-info="edit wall text"
+		class="icon-ios7-compose-outline"></span>
+ -->
+	<span
 		data-role='toggle-wallpaper-panel'
 		data-info="add wallpaper"
 		class="icon-ios7-keypad-outline"></span>
@@ -19,10 +25,14 @@
 		data-role='toggle-light-control'
 		data-info="edit room colors"
 		class="icon-ios7-sunny-outline"></span>
+
+[[ if (user.username == "test12343") { ]]
 	<span
-		data-role='edit-wall-text'
+		data-role='toggle-text-editor'
 		data-info="edit wall text"
 		class="icon-ios7-compose-outline"></span>
+[[ } ]]
+		
 	<span
 		data-role='toggle-project-settings'
 		data-info="room settings"
diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs
index 208dfff..95cf827 100644
--- a/views/controls/editor/wallpaper.ejs
+++ b/views/controls/editor/wallpaper.ejs
@@ -1,5 +1,5 @@
 <div class="vvbox wallpaper">
-	
+	<h4>Add Wallpaper</h4>
 	<!-- IF NO WALL PAPER -->
 	<span class="txt">Add custom wallpaper to walls. Begin by uploading a pattern. Or try this one -> </span>
 	
diff --git a/views/controls/reader/about-room.ejs b/views/controls/reader/about-room.ejs
index e13f363..ab8fee6 100644
--- a/views/controls/reader/about-room.ejs
+++ b/views/controls/reader/about-room.ejs
@@ -4,18 +4,18 @@
 		<a href="[[- authorlink ]]">[[- author ]]</a>
 	</h1>
 	[[ if (description) { ]]
-	<span class="txt">[[- description ]]</span>
+	<span class="txt">[[- description ]]</span><br>
 	[[ } ]]
-	<h2>
-	  Last modified [[- date ]]
+	
+	<span class="txt">Last modified [[- date ]]</span>
+
 	  [[ if (canEdit) { ]]
-	    <a href="[[- editlink ]]" class="btn warn marg">Edit Room</a>
+	   <br> <a href="[[- editlink ]]" class="btn warn marg">Edit Room</a>
 	  [[ } ]]
-	</h2>
 </div>
 
 <div class="share">
-	<h2>Share this on–</h2>
+	<h2>Share on–</h2>
 	<a href="#">Facebook</a>
 	<a href="#">Twitter</a>
 </div>
diff --git a/views/editor.ejs b/views/editor.ejs
index 9950878..e029225 100755
--- a/views/editor.ejs
+++ b/views/editor.ejs
@@ -17,6 +17,7 @@
 			[[ include controls/editor/media-editor ]]
 			[[ include controls/editor/wallpaper ]]
 			[[ include controls/editor/light-control ]]
+			[[ include controls/editor/text-editor ]]
 			[[ include controls/editor/collaborators ]]
 			[[ include controls/editor/settings ]]
 		</div>
diff --git a/views/home.ejs b/views/home.ejs
index e49dc4a..76b6cea 100755
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -15,7 +15,7 @@
 
 	<div class="hero" style="background-image:url(https://s3.amazonaws.com/luckyplop/6450f5b88c5c043a4551eff8902b1728f813bd66.jpg)">
 			<div class="holder">
-				<span class="circle">
+				<span class="circle wow bounceInDown">
 				<span class="videoTitle">Create 3D Rooms</span><br>
 				<span class="icon-ios7-play"></span><br>
 				<span class="videoTitle">Watch video.</span>
@@ -23,9 +23,47 @@
 			</div>
 	</div>
 	
+	<h1>Whats VValls For?</h1>
+	
+	<div class="projectList about">
+		<div class="item wow bounceInLeft">
+			<div class="rap">
+			<span style="background-image:url(http://www.articlesweb.org/blog/wp-content/gallery/artist-painting-techniques-you-must-know/artist-painting-techniques-you-must-know-15.jpg)">
+			</span>
+			<span>
+				<h3>Plan Your Art Show</h3>
+				<words>Whether you're and artist or curator, VValls makes visualizing art within a physical space much easier. With VValls you can build 3D rooms and put your add art to the walls. Map out how your next gallery show will look without having to drill into sheetrock.</words>
+			</span>
+		</div>
+	</div>
+		
+		<div class="item wow bounceInRight">
+			<div class="rap">
+			<span style="background-image:url(http://dump.fm/images/20100904/1283618382861-dumpfm-timb-paperrad.paranoia.gif)">
+			</span>
+			<span>
+				<h3>Defy The Status Quo</h3>
+				<words>There is no platform on the internet quite like VValls. Built using advanced HTML5 techniques, VValls opens up the possibilities of expression online. Go crazy, make other worldly rooms.</words>
+			</span>
+		</div>
+		</div>
+		
+		<div class="item wow bounceInLeft">
+			<div class="rap">
+			<span style="background-image:url(http://33.media.tumblr.com/tumblr_m0an31XPpF1qbhp9xo1_1280.jpg)">
+			</span>
+			<span>
+				<h3>Cutting Edge Presentations</h3>
+				<words>There's no cooler way than VValls for displaying your images online. Take your pix out of that drab Tumblr theme and present them in the freshest way online!</words>
+			</span>
+		</div>
+		</div>
+		
+	</div>
+	
 	<h1>Room Showcase</h1>
 	
-	[[ include projects/list-projects ]]
+
 	
 	<a href="#loadmore" class="viewMore btn">View More</a>
 
diff --git a/views/partials/header.ejs b/views/partials/header.ejs
index a48c5e1..065385d 100644
--- a/views/partials/header.ejs
+++ b/views/partials/header.ejs
@@ -1,4 +1,51 @@
-<a href="/" class="logo"><img src="/assets/img/logo4.svg"></a>
+<div id="header">
+<a href="/" class="logo">
+	<svg version="1.1"
+		 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+		 x="0px" y="0px" width="117px" height="44px" viewBox="-0.896 -0.441 117 44"
+		 overflow="visible" enable-background="new -0.896 -0.441 117 44" xml:space="preserve">
+	<defs>
+	</defs>
+	<path d="M0.54,38.759c0-1.44,0.66-3.72,1.56-6.18c1.38-3.84,3.42-8.22,4.5-11.16c0.48-1.32,0.78-2.34,0.78-2.88
+		c0-0.72-0.24-1.02-0.72-1.02c-1.38,0-4.74,5.16-5.4,6.24c-0.36,0.6-0.48,0.78-0.78,0.78c-0.3,0-0.48-0.06-0.48-0.36
+		c0-0.18,0.18-0.84,0.66-1.62c0.9-1.44,2.22-3.6,3.9-5.28c1.44-1.5,3.12-2.64,4.74-2.64c1.38,0,1.92,1.32,1.92,2.7
+		c0,1.02-0.42,2.58-1.02,4.32c-1.26,3.72-3.359,8.521-4.68,12.18c-0.66,1.92-1.14,3.54-1.14,4.62c0,1.38,0.48,2.459,1.979,2.459
+		c6.48,0,13.56-14.639,13.56-17.759c0-1.2-0.3-1.92-0.6-2.58c-0.42-0.9-0.9-1.62-0.9-3.18c0-1.86,0.84-2.76,1.8-2.76
+		c0.9,0,1.98,1.08,1.98,3.66c0,9.179-9.6,24.66-17.58,24.66c-2.82,0-4.08-1.561-4.08-4.141V38.759z"/>
+	<path d="M23.879,38.759c0-1.44,0.66-3.72,1.56-6.18c1.38-3.84,3.42-8.22,4.5-11.16c0.48-1.32,0.78-2.34,0.78-2.88
+		c0-0.72-0.24-1.02-0.72-1.02c-1.38,0-4.74,5.16-5.4,6.24c-0.36,0.6-0.48,0.78-0.78,0.78c-0.3,0-0.48-0.06-0.48-0.36
+		c0-0.18,0.18-0.84,0.66-1.62c0.9-1.44,2.22-3.6,3.9-5.28c1.44-1.5,3.12-2.64,4.74-2.64c1.38,0,1.92,1.32,1.92,2.7
+		c0,1.02-0.42,2.58-1.02,4.32c-1.26,3.72-3.36,8.521-4.68,12.18c-0.66,1.92-1.14,3.54-1.14,4.62c0,1.38,0.48,2.459,1.98,2.459
+		c6.479,0,13.559-14.639,13.559-17.759c0-1.2-0.3-1.92-0.6-2.58c-0.42-0.9-0.9-1.62-0.9-3.18c0-1.86,0.84-2.76,1.8-2.76
+		c0.9,0,1.979,1.08,1.979,3.66c0,9.179-9.6,24.66-17.579,24.66c-2.82,0-4.08-1.561-4.08-4.141V38.759z"/>
+	<path d="M44.339,37.799c0-5.22,2.76-10.92,6.36-15.299c3.66-4.44,8.159-7.5,11.759-7.5c2.7,0,3.78,1.44,3.9,1.44
+		s0.48-0.96,0.66-1.44c0.18-0.48,0.3-0.6,1.02-0.6h1.74c0.359,0,0.6,0.06,0.6,0.42c0,0.18-0.119,0.6-0.24,0.9
+		c-1.919,5.82-3.839,11.64-5.819,17.519c-1.14,3.48-1.26,4.381-1.26,5.041c0,0.659,0.3,0.84,0.66,0.84c0.54,0,1.68-1.141,3.72-4.26
+		c1.5-2.28,1.26-2.94,1.86-2.94c0.3,0,0.42,0.181,0.42,0.479c0,0.84-1.38,3.541-3.24,6c-1.8,2.52-4.14,4.8-6.12,4.8
+		c-1.38,0-1.62-0.96-1.62-2.159c0-0.961,0.24-2.101,0.72-3.66c0.54-1.98,1.5-4.62,2.82-8.52l-0.12-0.12
+		c-2.16,3.3-9.36,14.459-14.1,14.459c-2.76,0-3.72-2.159-3.72-5.339V37.799z M65.338,18.839c0-1.8-1.08-2.76-2.76-2.76
+		c-3,0-6.6,3.72-9.48,8.22c-2.82,4.5-4.919,9.839-4.919,13.019c0,1.561,0.54,2.641,1.86,2.641c2.22,0,6.06-4.26,9.3-9
+		c3.3-4.74,6-10.02,6-12.06V18.839z"/>
+	<path d="M72.178,39.839c0-1.08,0.479-3.479,1.2-6.479c1.74-7.02,4.979-17.52,6.6-23.64c0.66-2.46,1.08-4.2,1.08-4.8
+		c0-0.78-0.24-1.32-1.62-1.44c-1.14-0.12-1.38-0.3-1.38-0.78c0.061-0.42,0.779-0.66,1.8-0.66c2.58,0,4.2-0.78,5.16-1.38
+		c0.6-0.36,0.96-0.66,1.14-0.66c0.3,0,0.42,0.12,0.42,0.48c0,0.3-0.6,1.56-1.14,3.479c-5.04,17.759-7.38,25.799-8.46,29.698
+		c-0.84,3.061-0.96,3.84-0.96,4.681c0,0.6,0.3,1.02,0.78,1.02c0.84,0,1.619-0.659,3.479-3.72c1.08-1.74,1.92-4.199,2.46-4.199
+		c0.301,0,0.42,0.239,0.42,0.539c0,0.42-0.84,2.521-2.16,4.74c-1.739,3-4.319,6.24-6.719,6.24c-1.681,0-2.101-1.32-2.101-3.061
+		V39.839z"/>
+	<path d="M85.497,39.839c0-1.08,0.48-3.479,1.2-6.479c1.739-7.02,4.979-17.52,6.6-23.64c0.66-2.46,1.08-4.2,1.08-4.8
+		c0-0.78-0.24-1.32-1.62-1.44c-1.14-0.12-1.38-0.3-1.38-0.78c0.06-0.42,0.78-0.66,1.8-0.66c2.58,0,4.2-0.78,5.16-1.38
+		c0.6-0.36,0.96-0.66,1.14-0.66c0.3,0,0.42,0.12,0.42,0.48c0,0.3-0.6,1.56-1.14,3.479c-5.04,17.759-7.38,25.799-8.46,29.698
+		c-0.84,3.061-0.96,3.84-0.96,4.681c0,0.6,0.301,1.02,0.78,1.02c0.84,0,1.62-0.659,3.479-3.72c1.08-1.74,1.92-4.199,2.46-4.199
+		c0.3,0,0.42,0.239,0.42,0.539c0,0.42-0.84,2.521-2.159,4.74c-1.74,3-4.32,6.24-6.721,6.24c-1.68,0-2.1-1.32-2.1-3.061V39.839z"/>
+	<path d="M111.416,34.619c0,2.34-0.96,4.439-2.46,5.939c-1.68,1.68-4.02,2.64-6.479,2.64c-1.86,0-3.84-0.78-5.04-1.56
+		c-0.6-0.42-1.02-0.84-1.02-1.2c0-0.96,0.359-3.12,0.959-5.819c0.42-1.98,0.48-2.34,1.08-2.34c0.541,0,0.601,0.359,0.601,2.16
+		c0,3.84,1.2,7.319,4.92,7.319c2.34,0,4.2-2.46,4.2-4.74c0-2.819-1.561-4.979-3.24-6.96c-1.68-1.979-3.24-4.08-3.24-6.899
+		c0-4.38,3.24-8.76,7.859-8.76c3,0,5.82,1.38,5.82,2.1c0,1.14-0.301,2.4-0.66,3.9c-0.72,2.76-0.779,3.06-1.38,3.06
+		c-0.899,0-0.78-1.92-1.08-3.84c-0.3-1.86-1.08-3.78-3.6-3.78c-2.34,0-4.08,2.04-4.08,4.439s1.62,4.44,3.24,6.6
+		c1.8,2.34,3.6,4.68,3.6,7.68V34.619z"/>
+	</svg>
+	
+</a>
 
 <div id="minotaur">
   <span class="label"></span>
@@ -6,21 +53,28 @@
 
 <span class="topLinks">
 [[ if (logged_in) { ]]
-
 	[[ if (user.isStaff) { ]]
 		<a href="/layout" data-role="show-layouts-modal" class="topLink">Layouts</a>
 	[[ } ]]
 
-	<a href="/project" data-role="show-projects-modal" class="topLink">Projects</a>
+	<!--<a href="/project" data-role="show-projects-modal" class="topLink">Projects</a>-->
+	
+	<a href="#"  data-role="new-project-modal">New Project</a>
+	
 
 	[[ if (profile && String(user._id) == String(profile._id)) { ]]
 	<a href="/profile" data-role="edit-profile-modal" class="topLink editProfile">Settings</a>
 	[[ } else if (! profile) { ]]
 	<a href="/profile" class="topLink">Profile</a>
 	[[ } ]]
-
+	
+	[[ if (opt.editing) { ]]
+	<a href="#" class="icon-help-circled" id="help-button"></a>
+	[[ } ]]
+	
 [[ } else { ]]
 	<a href="/signup" data-role="show-signup-modal" class="signUp topLink">Sign Up</a>
 	<a href="/login" data-role="show-signin-modal" class="signIn topLink">Sign In</a>
 [[ } ]]
 </span>
+</div>
\ No newline at end of file
diff --git a/views/partials/meta.ejs b/views/partials/meta.ejs
index 9916b34..4e94a5e 100644
--- a/views/partials/meta.ejs
+++ b/views/partials/meta.ejs
@@ -32,6 +32,7 @@
 	<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
 	<link href='/assets/stylesheets/ionicons.css' rel='stylesheet' type='text/css'>
 	<link href='/assets/stylesheets/app.css' rel='stylesheet' type='text/css'>
+	<link href='/assets/stylesheets/animate.css' rel='stylesheet' type='text/css'>
 	<!--[if lt IE 9]>
 	<style>
 
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 7d56b2e..1ce180a 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -2,9 +2,11 @@
 <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/lodash/dist/lodash.min.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/momentjs/min/moment.min.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/fiber/src/fiber.min.js"></script>
+<script type="text/javascript" src="/assets/javascripts/vendor/bower_components/prefixfree/prefixfree.min.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/tube.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/loader.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/polyfill.js"></script>
+<script type="text/javascript" src="/assets/javascripts/vendor/wow.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/sha1.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/dataUriToBlob.js"></script>
 <script type="text/javascript" src="/assets/javascripts/util.js"></script>
@@ -50,6 +52,7 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/_scenery.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/move.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/resize.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/randomize.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/undo.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/_object.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/image.js"></script>
@@ -97,10 +100,12 @@
 <script type="text/javascript" src="/assets/javascripts/ui/editor/MediaEditor.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/MediaUpload.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/MediaViewer.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/editor/TextEditor.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/WallpaperPicker.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/ui/reader/ReaderView.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/reader/MediaPlayer.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/reader/Tracker.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/ui/_router.js"></script>
 
diff --git a/views/profile.ejs b/views/profile.ejs
index ada3d52..9cfb40d 100644
--- a/views/profile.ejs
+++ b/views/profile.ejs
@@ -8,17 +8,17 @@
 <div class="rapper page">
 	[[- include partials/header ]]
 	
-	<table class="profilepage">
-		<tr>
+	<div class="profilepage">
 			[[ if (profile.photo && profile.photo.length) { ]]
-			<td class="border profilePic" style="background-image:url([[- profile.photo ]])">
-			</td>
+			<div class="profilePic" style="background-image:url([[- profile.photo ]])">
+			</div>
 			[[ } else { ]]
-			<td class="border profilePic">
+			<div class="profilePic">
 				<span class="icon-ios7-person-outline"></span>
-			</td>
+			</div>
 			[[ } ]]
-			<td class="bio">
+			<div class="bio">
+				<div class="holder">
 				<h2>[[- profile.displayName ]]</h2>
 				[[ if (profile.location) { ]]
 				<span>
@@ -35,9 +35,9 @@
 					<a href="https://twitter.com/[[- profile.twitterName ]]">@[[- profile.twitterName ]]</a>
 				</span>
 				[[ } ]]
-			</td>
-		</tr>
-	</table>
+			</div>
+			</div>
+	</div>
 
 	[[ if (projects.length) { ]]
 		<h1>[[- profile.username ]] has [[- projects.length ]] project[[- projects.length != 1 ? "s" : "" ]]</h1>
@@ -45,7 +45,7 @@
 	
 	[[ include projects/list-projects ]]
 
-	<a href="#" data-role="new-project-modal" class="viewMore btn">create project</a>
+	<a href="#" class="viewMore btn">view more</a>
 	
 	[[ include partials/edit-profile ]]
 	[[ include projects/layouts-modal ]]	
diff --git a/views/projects/layouts-modal.ejs b/views/projects/layouts-modal.ejs
index 34dc9af..24a83b7 100644
--- a/views/projects/layouts-modal.ejs
+++ b/views/projects/layouts-modal.ejs
@@ -33,7 +33,7 @@
 	<span class="close">X</span>
 	<div class="box">
 		
-    <h1>Choose Room Template</h1>
+    <h2>Choose Room Template</h2>
 		<div class="templates">
 		</div>
 		<div class="no-templates">
diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs
index 537d409..a9f9523 100644
--- a/views/projects/list-projects.ejs
+++ b/views/projects/list-projects.ejs
@@ -5,7 +5,14 @@
 		[[ projects.forEach(function(project, i) { ]]
 
 			<span class="room">
-				<iframe src="/project/[[- project.slug ]]/view?noui=1&mute=1" class="embed"></iframe>
+        <span class="images">
+          [[ mediaCount = 0 ]]
+          [[ project.media.some(function(media){ ]]
+            [[ if (media.media.type != "image") { return false } ]]
+            [[ if (++mediaCount > 3) { return true } ]]
+            <img src="[[- media.media.url ]]">
+          [[ }) ]]
+			  </span>
 				[[ if (String(user._id) == String(project.user_id)) { ]]
 				<a href="/project/[[- project.slug ]]/edit"><div class="editBtn">edit</div></a>
 				[[ } ]]