4 files changed, 23 insertions, 31 deletions
diff --git a/files/webapp/views/home/_content.html.haml b/files/webapp/views/home/_content.html.haml
new file mode 100644
index 0000000..fbca554
--- /dev/null
+++ b/files/webapp/views/home/_content.html.haml
@@ -0,0 +1,8 @@
+.row-fluid
+  .span12
+    %p.introtext
+      <b>Bitmask</b> is an open source application to provide easy and secure encrypted communication. You can choose among <a href="#providers">several different service providers</a>, or <a href="https://leap.se/en/doc/platform">start your own</a>. Currently, Bitmask supports encrypted internet and encrypted email (with more services in the works).
+
+    = render 'common/home_page_buttons', :divider => 'home/bitmask'
+
+    = render 'text'
+\ No newline at end of file
diff --git a/files/webapp/views/home/_masthead.html.haml b/files/webapp/views/home/_masthead.html.haml
index b04661c..bce5505 100644
--- a/files/webapp/views/home/_masthead.html.haml
+++ b/files/webapp/views/home/_masthead.html.haml
@@ -1,17 +1,15 @@
-.home-page
-  .masthead
-    .heroish-unit.clearfix
-      .text
-        .title Bitmask
-        .tagline Encrypted communication for mere mortals<br/>(superheroes welcome, too).
-    .navcontainer
-      .navheader
-        %ul.nav.nav-pills
-          %li
-            %a{href:"#how-it-works"} How it works
-          %li
-            %a{href:"#providers"} Supported providers
-          %li
-            %a{href:"#about-us"} About us
-          %li
-            %a{href:"#code"} Fork our code
-\ No newline at end of file
+#masthead
+  .text
+    .title Bitmask
+    .tagline Encrypted communication for mere mortals<br/>(superheroes welcome, too).
+.navcontainer
+  .navheader
+    %ul.nav.nav-pills
+      %li
+        %a{href:"#how-it-works"} How it works
+      %li
+        %a{href:"#providers"} Supported providers
+      %li
+        %a{href:"#about-us"} About us
+      %li
+        %a{href:"#code"} Fork our code
diff --git a/files/webapp/views/home/_home_content.html.haml b/files/webapp/views/home/_text.html.haml
index 58f881b..58f881b 100644
--- a/files/webapp/views/home/_home_content.html.haml
+++ b/files/webapp/views/home/_text.html.haml
diff --git a/files/webapp/views/home/index.html.haml b/files/webapp/views/home/index.html.haml
deleted file mode 100644
index 4483ee3..0000000
--- a/files/webapp/views/home/index.html.haml
+++ /dev/null
@@ -1,14 +0,0 @@
-- icon_color = :black
-
-= render 'masthead'
-
-#main.home-page
-  .container-fluid
-    .row-fluid
-      .span12
-        %p.introtext
-          <b>Bitmask</b> is an open source application to provide easy and secure encrypted communication. You can choose among <a href="#providers">several different service providers</a>, or <a href="https://leap.se/en/doc/platform">start your own</a>. Currently, Bitmask supports encrypted internet and encrypted email (with more services in the works).
-
-        = render 'common/home_page_buttons', :divider => 'home/bitmask'
-
-        = render 'home_content'
-\ No newline at end of file