diff --git a/app/assets/javascripts/app/app.js b/app/assets/javascripts/app/app.js
index 663353243a489365d4813a9e05db170953fce321..4dd6aca79747f0bc0137ebb73eb4ab7f371822a0 100644
--- a/app/assets/javascripts/app/app.js
+++ b/app/assets/javascripts/app/app.js
@@ -6,6 +6,9 @@
 //= require_tree ./pages
 //= require_tree ./collections
 //= require_tree ./views
+//= require ./forms
+//= require_tree ./forms
+
 var app = {
   collections: {},
   models: {},
diff --git a/app/assets/javascripts/app/views/post/day_view.js b/app/assets/javascripts/app/views/post/day_view.js
index f01bb41a9f81f6a6c9ef28fffa280fdc856c4afa..e9245ebed2d532fdbbda8ff77b567d5f83bbb794 100644
--- a/app/assets/javascripts/app/views/post/day_view.js
+++ b/app/assets/javascripts/app/views/post/day_view.js
@@ -1,3 +1,4 @@
+//= require ../post_view
 app.views.Post.Day = app.views.Post.extend({
   templateName : "day",
   className : "day post loaded",
diff --git a/app/assets/javascripts/app/views/post_view.js b/app/assets/javascripts/app/views/post_view.js
index 408ea4934cdae4a239165e35dedeb245ef72216a..952e34b84a91c8a47e66c617536def67e21b3ac8 100644
--- a/app/assets/javascripts/app/views/post_view.js
+++ b/app/assets/javascripts/app/views/post_view.js
@@ -1,4 +1,5 @@
 //= require ./stream_object_view
+
 app.views.Post = app.views.StreamObject.extend({
   presenter : function() {
     return _.extend(this.defaultPresenter(), {
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index c9260a2dc000dfe34afe594adcc2345c718320c9..50aecafbc5720215921f1dffa1b74b9592e2ab81 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -30,7 +30,6 @@
 //= require_tree ./helpers
 //= require_tree ./pages
 //= require_tree ./widgets
-//= require_tree ./forms
 //= require view
 //= require aspects-dropdown
 //= require contact-edit
diff --git a/app/assets/stylesheets/new-templates.css.scss b/app/assets/stylesheets/new-templates.css.scss
index aff58a845928f56bb88b9f0f310298dd70530bc0..c8ce38355676c758d7ba4d14fba067c3c27e8367 100644
--- a/app/assets/stylesheets/new-templates.css.scss
+++ b/app/assets/stylesheets/new-templates.css.scss
@@ -1,4 +1,5 @@
 /* variables */
+
 $light-grey: #999;
 $pane-width: 420px;
 
@@ -87,7 +88,7 @@ $pane-width: 420px;
 
 @mixin dark-hatched-bg() {
   background-color: #444;
-  background-image: image-url("hatched-bg-dark.png");
+  background-image: url("../images/hatched-bg-dark.png");
 }
 
 @mixin photo-shadow() {
@@ -107,15 +108,15 @@ $pane-width: 420px;
 
 /* bootstrap extentions */
 .icon-red {
-  background-image: url("/img/glyphicons-halflings-red.png");
+  background-image: url(../img/glyphicons-halflings-red.png);
 }
 
 .icon-green {
-  background-image: url("/img/glyphicons-halflings-green.png");
+  background-image: url(../img/glyphicons-halflings-green.png);
 }
 
 .icon-blue {
-  background-image: url("/img/glyphicons-halflings-blue.png");
+  background-image: url(../img/glyphicons-halflings-blue.png);
 }
 
 /* styles */
@@ -515,7 +516,7 @@ body.idle {
 
     border-top: 1px solid #444;
     text-align: left;
-    background-image: image-url("hatched-bg-dark.png");
+    background-image: url("../images/hatched-bg-dark.png");
   }
 
   #new-post-comment-container {
@@ -807,4 +808,4 @@ text-rendering: optimizelegibility;
 
 .headline p{
   @include media-text();
-}
+}
\ No newline at end of file
diff --git a/app/assets/javascripts/app/templates/aspects-dropdown.handlebars b/app/assets/templates/aspects-dropdown.handlebars
similarity index 100%
rename from app/assets/javascripts/app/templates/aspects-dropdown.handlebars
rename to app/assets/templates/aspects-dropdown.handlebars
diff --git a/app/assets/javascripts/app/templates/day.handlebars b/app/assets/templates/day.handlebars
similarity index 100%
rename from app/assets/javascripts/app/templates/day.handlebars
rename to app/assets/templates/day.handlebars
diff --git a/app/assets/javascripts/app/templates/framer.handlebars b/app/assets/templates/framer.handlebars
similarity index 100%
rename from app/assets/javascripts/app/templates/framer.handlebars
rename to app/assets/templates/framer.handlebars
diff --git a/app/assets/javascripts/app/templates/photo-viewer.handlebars b/app/assets/templates/photo-viewer.handlebars
similarity index 100%
rename from app/assets/javascripts/app/templates/photo-viewer.handlebars
rename to app/assets/templates/photo-viewer.handlebars
diff --git a/app/assets/javascripts/app/templates/picture-form.handlebars b/app/assets/templates/picture-form.handlebars
similarity index 100%
rename from app/assets/javascripts/app/templates/picture-form.handlebars
rename to app/assets/templates/picture-form.handlebars
diff --git a/app/assets/javascripts/app/templates/post-form.handlebars b/app/assets/templates/post-form.handlebars
similarity index 100%
rename from app/assets/javascripts/app/templates/post-form.handlebars
rename to app/assets/templates/post-form.handlebars
diff --git a/app/assets/javascripts/app/templates/post-new.handlebars b/app/assets/templates/post-new.handlebars
similarity index 100%
rename from app/assets/javascripts/app/templates/post-new.handlebars
rename to app/assets/templates/post-new.handlebars
diff --git a/app/assets/javascripts/app/templates/services-selector.handlebars b/app/assets/templates/services-selector.handlebars
similarity index 100%
rename from app/assets/javascripts/app/templates/services-selector.handlebars
rename to app/assets/templates/services-selector.handlebars
diff --git a/app/assets/javascripts/app/templates/template-picker.handlebars b/app/assets/templates/template-picker.handlebars
similarity index 100%
rename from app/assets/javascripts/app/templates/template-picker.handlebars
rename to app/assets/templates/template-picker.handlebars