diff --git a/app/views/artist/_page.html.haml b/app/views/artist/_page.html.haml
index 7c59cba..68cf1a0 100644
--- a/app/views/artist/_page.html.haml
+++ b/app/views/artist/_page.html.haml
@@ -7,7 +7,8 @@
   .span7.columns.desc
     %h2
       = @data[:name]
-      %small= " "+@data[:original_name] unless @data[:name] == @data[:original_name]
+      - unless @data[:original_name].nil? and @data[:name] == @data[:original_name]
+        %small= " #{@data[:original_name]}"
     %p= @data[:desc].html_safe unless @data[:desc].nil?
     - unless @data[:artist_links].empty?
       .service-icons
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index a61d384..fc42cb3 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -11,12 +11,12 @@
     %link{ rel: "shortcut icon", href: "/favicon.ico" }
     %link{ rel: "apple-touch-icon", href: image_path("logo.png") }
     %link{ rel: "search", type: "application/opensearchdescription+xml", title: "BeatHaven", href: "/opensearch.xml"}
-    = stylesheet_link_tag :application, cache: true
-    = javascript_include_tag :application, cache: true
+    = stylesheet_link_tag "application"
+    = javascript_include_tag "application"
     = javascript_include_tag "http://userapi.com/js/api/openapi.js?45", charset: "windows-1251"
   %body
     #fb-root
-    .topbar-wrapper 
+    .topbar-wrapper
       .topbar
         .topbar-inner
           .container
@@ -44,7 +44,7 @@
                   %li.divider
                   %li
                     %a#logout{ :href => "#/logout/" }= t('global.logout')
-    
+
     .popover-wrapper
       .popover.below#autocomplete-container
         .arrow