diff --git a/Gemfile b/Gemfile
index 27b5ceb..e54c577 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,6 +16,7 @@ gem 'girl_friday', '~> 0.11.2'
gem 'thin', '~> 1.5.0'
gem 'open4', '~> 1.3.0'
gem 'redcarpet', '~> 2.2.2'
+gem 'slim'
# Gems used only for assets and not required
# in production environments by default.
diff --git a/Gemfile.lock b/Gemfile.lock
index 5a9530b..e9ea244 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -275,6 +275,9 @@ GEM
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)
+ slim (2.0.0)
+ temple (~> 0.6.5)
+ tilt (~> 1.3, >= 1.3.3)
slop (3.4.5)
spoon (0.0.4)
ffi
@@ -283,6 +286,7 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
+ temple (0.6.5)
thin (1.5.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
@@ -342,6 +346,7 @@ DEPENDENCIES
sass-rails (~> 3.2.6)
simple_form (~> 2.0.4)
simplecov (~> 0.7.1)
+ slim
thin (~> 1.5.0)
uglifier (>= 1.0.3)
unicorn (~> 4.6.2)
diff --git a/app/views/application/not_found.html.erb b/app/views/application/not_found.html.erb
deleted file mode 100644
index b555997..0000000
--- a/app/views/application/not_found.html.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
404
-
- You shouldn't be here. Really.
-
-
-
-
diff --git a/app/views/application/not_found.html.slim b/app/views/application/not_found.html.slim
new file mode 100644
index 0000000..87a7199
--- /dev/null
+++ b/app/views/application/not_found.html.slim
@@ -0,0 +1,5 @@
+section.supplimental.error-404
+ .wrapper
+ h1 404
+ p You shouldn't be here. Really.
+ .vertical-expander
diff --git a/app/views/layouts/_navigation.html.erb b/app/views/layouts/_navigation.html.erb
deleted file mode 100644
index 408e65e..0000000
--- a/app/views/layouts/_navigation.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-
- - <%= link_to "Browse", browse_path %>
- - <%= link_to "Record", docs_path(:record) %>
-
diff --git a/app/views/layouts/_navigation.html.slim b/app/views/layouts/_navigation.html.slim
new file mode 100644
index 0000000..8f4dcb3
--- /dev/null
+++ b/app/views/layouts/_navigation.html.slim
@@ -0,0 +1,3 @@
+ul
+ li = link_to "Browse", browse_path
+ li = link_to "Record", docs_path(:record)
diff --git a/app/views/layouts/_session_info.html.erb b/app/views/layouts/_session_info.html.erb
deleted file mode 100644
index 96c18ed..0000000
--- a/app/views/layouts/_session_info.html.erb
+++ /dev/null
@@ -1,20 +0,0 @@
-
- <% if current_user %>
- -
- <%= current_user.img_link(:title => '') %>
- <%= current_user.link(:title => '') %>
-
-
-
-
- <% else %>
- - <%= link_to "Log in", login_path %>
- <% end %>
-
diff --git a/app/views/layouts/_session_info.html.slim b/app/views/layouts/_session_info.html.slim
new file mode 100644
index 0000000..c480a2c
--- /dev/null
+++ b/app/views/layouts/_session_info.html.slim
@@ -0,0 +1,13 @@
+ul.session-info
+ - if current_user
+ li.username
+ => current_user.img_link(:title => '')
+ = current_user.link(:title => '')
+ ul.menu
+ li
+ a.settings href=edit_user_path Settings
+ li
+ a.logout href=logout_path Log out
+ - else
+ li
+ a href=login_path Log in
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
deleted file mode 100644
index 8cd1f30..0000000
--- a/app/views/layouts/application.html.erb
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-
- <%= page_title %>
- <%= csrf_meta_tags %>
-
-
-
-
- <%= stylesheet_link_tag "application", :media => "all" %>
-
- <%= javascript_include_tag "application" %>
- <%= javascript_include_tag "player" %>
-
- <%= favicon_link_tag 'favicon.png' %>
-
- <%= render :partial => 'layouts/current_user_js' %>
- <%= render :partial => 'layouts/ga' %>
-
-
-
-
-
-
-
-
-
- <%= render :partial => 'layouts/navigation' %>
-
- <%= render :partial => 'layouts/session_info' %>
-
-
-
-
- <% flash.each do |type, message| %>
- <%= message %>
- <% end %>
-
-
- <%= content_for?(:content) ? yield(:content) : yield %>
-
-
-
-
-
-
diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim
new file mode 100644
index 0000000..470a1bb
--- /dev/null
+++ b/app/views/layouts/application.html.slim
@@ -0,0 +1,38 @@
+doctype html
+html[lang="en"]
+ head
+ meta[charset="utf-8"]
+ title = page_title
+ = csrf_meta_tags
+ = stylesheet_link_tag "application", :media => "all"
+ = javascript_include_tag "application"
+ = javascript_include_tag "player"
+ = favicon_link_tag 'favicon.png'
+ = render :partial => 'layouts/current_user_js'
+ = render :partial => 'layouts/ga'
+ script
+ | window.unpackWorkerPath = '#{javascript_path "unpack_worker"}';
+ window.mainWorkerPath = '#{javascript_path "main_worker"}';
+ body
+ header
+ .wrapper
+ h1
+ a href="/"
+ ' ascii.io
+ span.cursor-block
+ .navigation
+ = render :partial => 'layouts/navigation'
+ .divider-vertical
+ = render :partial => 'layouts/session_info'
+ - flash.each do |type, message|
+ p[class=type] = message
+ #content
+ = content_for?(:content) ? yield(:content) : yield
+ footer
+ .wrapper
+ p.links
+ = link_to 'About', docs_path(:about)
+ p.title
+ ' Created by
+ = link_to 'Marcin Kulik', 'https://github.com/sickill'
+ img.avatar alt="Marcin" src="http://gravatar.com/avatar/9cecfc695240b56e5d3c1a5dc3830967"