diff --git a/.gitignore b/.gitignore
index 1b1b92d..d553916 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ doc/app_horo
 doc/*.png
 .DS_Store
 .svn
+public/system/*
 config/analytics.js
 nbproject/*
 vendor/plugins/prawn-format
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 756ae1d..57cdb6d 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -2,17 +2,16 @@
 <html lang='en'>
   <head>
     <meta charset='UTF-8'>
-    <title><%= StaticData.site_name %> - <%= controller.controller_name.humanize %></title>
+      <title><%= StaticData.site_name %> - <%= controller.controller_name.humanize %></title>
 
-    <%= stylesheet_link_tag 'screen', 'menu', 'tabs', 'local', :cache => true -%>
-
-    <%= javascript_include_tag 'protoaculous.1.8.3.min', 'livepipe', 'tabs',
-      'scal', 'tablekit', 'event.simulate', 'application', :cache => true -%>
-    <% javascript_tag do %>
-      TableKit.options.rowEvenClass = 'even';
-      TableKit.options.rowOddClass = 'odd';
-    <% end %>
+      <%= stylesheet_link_tag 'screen', 'menu', 'tabs', 'local', :cache => '../system/all' -%>
 
+      <%= javascript_include_tag 'protoaculous.1.8.3.min', 'livepipe', 'tabs',
+        'scal', 'tablekit', 'event.simulate', 'application', :cache => '../system/all' -%>
+      <% javascript_tag do %>
+        TableKit.options.rowEvenClass = 'even';
+        TableKit.options.rowOddClass = 'odd';
+      <% end %>
     <%= @content_for_page_header -%>
 
   </head>
@@ -22,15 +21,15 @@
     <div class='container showgri'>
       <div id='header' class='span-25 last'>
 
-        <div class='span-2'>
-          <a href='/'><img class='top' src='/images/logo.png' alt="logo" width='60px' height='60px' /></a>
-        </div>
-
         <% cache 'layout_header' do %>
-        <div class='span-12'>
-          <span class='title last'><%= StaticData.site_name %></span>
-          <span class='tagline column span-12'><%= StaticData.tag_line %></span>
-        </div>
+          <div class='span-2'>
+            <a href='/'><img class='top' src='/images/logo.png' alt="logo" width='60px' height='60px' /></a>
+          </div>
+
+          <div class='span-12'>
+            <span class='title last'><%= StaticData.site_name %></span>
+            <span class='tagline column span-12'><%= StaticData.tag_line %></span>
+          </div>
         <% end %>
 
         <div id='account-info' class='span-9 last'>
diff --git a/public/javascripts/livepipe-ui b/public/javascripts/livepipe-ui
deleted file mode 160000
index d6f201f..0000000
--- a/public/javascripts/livepipe-ui
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d6f201f3d8cf950814c711209f726e6322472c17
