diff --git a/app/assets/javascripts/layout.js b/app/assets/javascripts/layout.js
index e9ab3998e..5f2a4947d 100644
--- a/app/assets/javascripts/layout.js
+++ b/app/assets/javascripts/layout.js
@@ -318,7 +318,6 @@
         function linkClicked(evt) {
             evt.preventDefault();
             var destination = $(this).attr('layout-link');
-            console.debug("Destination:" + destination);
             var destinationType = $('[layout-id="' + destination + '"]').attr("layout");
             if (destinationType === "screen") {
                 self.location = '#/' + destination;
diff --git a/app/assets/stylesheets/lato.css b/app/assets/stylesheets/lato.css
new file mode 100644
index 000000000..ed16aefd1
--- /dev/null
+++ b/app/assets/stylesheets/lato.css
@@ -0,0 +1,116 @@
+@font-face {
+    font-family: 'LatoBlackItalic';
+    src: url('lato/Lato-BlaIta-webfont.eot');
+    src: url('lato/Lato-BlaIta-webfont.eot?#iefix') format('embedded-opentype'),
+         url('lato/Lato-BlaIta-webfont.woff') format('woff'),
+         url('lato/Lato-BlaIta-webfont.ttf') format('truetype'),
+         url('lato/Lato-BlaIta-webfont.svg#LatoBlackItalic') format('svg');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+@font-face {
+    font-family: 'LatoBlack';
+    src: url('lato/Lato-Bla-webfont.eot');
+    src: url('lato/Lato-Bla-webfont.eot?#iefix') format('embedded-opentype'),
+         url('lato/Lato-Bla-webfont.woff') format('woff'),
+         url('lato/Lato-Bla-webfont.ttf') format('truetype'),
+         url('lato/Lato-Bla-webfont.svg#LatoBlack') format('svg');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+@font-face {
+    font-family: 'LatoBoldItalic';
+    src: url('lato/Lato-BolIta-webfont.eot');
+    src: url('lato/Lato-BolIta-webfont.eot?#iefix') format('embedded-opentype'),
+         url('lato/Lato-BolIta-webfont.woff') format('woff'),
+         url('lato/Lato-BolIta-webfont.ttf') format('truetype'),
+         url('lato/Lato-BolIta-webfont.svg#LatoBoldItalic') format('svg');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+@font-face {
+    font-family: 'LatoBold';
+    src: url('lato/Lato-Bol-webfont.eot');
+    src: url('lato/Lato-Bol-webfont.eot?#iefix') format('embedded-opentype'),
+         url('lato/Lato-Bol-webfont.woff') format('woff'),
+         url('lato/Lato-Bol-webfont.ttf') format('truetype'),
+         url('lato/Lato-Bol-webfont.svg#LatoBold') format('svg');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+@font-face {
+    font-family: 'LatoItalic';
+    src: url('lato/Lato-RegIta-webfont.eot');
+    src: url('lato/Lato-RegIta-webfont.eot?#iefix') format('embedded-opentype'),
+         url('lato/Lato-RegIta-webfont.woff') format('woff'),
+         url('lato/Lato-RegIta-webfont.ttf') format('truetype'),
+         url('lato/Lato-RegIta-webfont.svg#LatoItalic') format('svg');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+@font-face {
+    font-family: 'LatoRegular';
+    src: url('lato/Lato-Reg-webfont.eot');
+    src: url('lato/Lato-Reg-webfont.eot?#iefix') format('embedded-opentype'),
+         url('lato/Lato-Reg-webfont.woff') format('woff'),
+         url('lato/Lato-Reg-webfont.ttf') format('truetype'),
+         url('lato/Lato-Reg-webfont.svg#LatoRegular') format('svg');
+    font-weight: normal;
+    font-style: normal;
+
+}
+@font-face {
+    font-family: 'LatoLightItalic';
+    src: url('lato/Lato-LigIta-webfont.eot');
+    src: url('lato/Lato-LigIta-webfont.eot?#iefix') format('embedded-opentype'),
+         url('lato/Lato-LigIta-webfont.woff') format('woff'),
+         url('lato/Lato-LigIta-webfont.ttf') format('truetype'),
+         url('lato/Lato-LigIta-webfont.svg#LatoLightItalic') format('svg');
+    font-weight: normal;
+    font-style: normal;
+
+}
+@font-face {
+    font-family: 'LatoLight';
+    src: url('lato/Lato-Lig-webfont.eot');
+    src: url('lato/Lato-Lig-webfont.eot?#iefix') format('embedded-opentype'),
+         url('lato/Lato-Lig-webfont.woff') format('woff'),
+         url('lato/Lato-Lig-webfont.ttf') format('truetype'),
+         url('lato/Lato-Lig-webfont.svg#LatoLight') format('svg');
+    font-weight: normal;
+    font-style: normal;
+
+}
+@font-face {
+    font-family: 'LatoHairlineItalic';
+    src: url('lato/Lato-HaiIta-webfont.eot');
+    src: url('lato/Lato-HaiIta-webfont.eot?#iefix') format('embedded-opentype'),
+         url('lato/Lato-HaiIta-webfont.woff') format('woff'),
+         url('lato/Lato-HaiIta-webfont.ttf') format('truetype'),
+         url('lato/Lato-HaiIta-webfont.svg#LatoHairlineItalic') format('svg');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+@font-face {
+    font-family: 'LatoHairline';
+    src: url('lato/Lato-Hai-webfont.eot');
+    src: url('lato/Lato-Hai-webfont.eot?#iefix') format('embedded-opentype'),
+         url('lato/Lato-Hai-webfont.woff') format('woff'),
+         url('lato/Lato-Hai-webfont.ttf') format('truetype'),
+         url('lato/Lato-Hai-webfont.svg#LatoHairline') format('svg');
+    font-weight: normal;
+    font-style: normal;
+
+}
\ No newline at end of file
diff --git a/app/views/clients/index.html.erb b/app/views/clients/index.html.erb
index bb54e2fad..6c34e12aa 100644
--- a/app/views/clients/index.html.erb
+++ b/app/views/clients/index.html.erb
@@ -384,31 +384,11 @@
             <p></p>
         </div>
 
-    <!-- Templates for use by JS -->
-    <script type="text/template" id="channel-view">
-        <div class="channel-container">
-            <div class="input-meter">
-            </div>
-            <div class="slider-guide">
-            </div>
-            <div class="slider-handle">
-            </div>
-            <div class="mute">
-                <div class="mute-button"></div>
-                <p>Mute</p>
-            </div>
-            <div class="channel-info">
-                <p>{name}</p>
-                <p>{instrument}</p>
-            </div>
-        </div>
-      </script>
-
-<script type="text/javascript">
+    <script type="text/javascript">
         $(function() {
             var jk = JamKazam();
             jk.initialize();
         })
-      </script>
+    </script>
 
 
diff --git a/app/views/layouts/client.html.erb b/app/views/layouts/client.html.erb
index 041592a26..0e1acf064 100644
--- a/app/views/layouts/client.html.erb
+++ b/app/views/layouts/client.html.erb
@@ -5,7 +5,6 @@
     <!--[if IE]>
         <link rel="stylesheet" type="text/css" href="css/ie.css" media="screen, projection"/>
     <![endif]--> 
-    <%= stylesheet_link_tag    "common", media: "all" %>
     <%= stylesheet_link_tag    "ie", media: "all" %>
     <%= stylesheet_link_tag    "jamkazam", media: "all" %>
     <%= stylesheet_link_tag    "lato", media: "all" %>
diff --git a/config/application.rb b/config/application.rb
index f68e29ce7..390f02ace 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -67,5 +67,9 @@ module SampleApp
 
     # Runs the websocket gateway within the web app
     config.websocket_gateway_uri = "ws://localhost:6767/websocket"
+
+    # Add the assets/fonts directory to assets.paths
+    config.assets.paths << "#{Rails.root}/app/assets/fonts"
+
   end
 end