diff --git a/app/views/conferences/_call_for_content.haml b/app/views/conferences/_call_for_content.haml
index 8287e911..6fab5dc6 100644
--- a/app/views/conferences/_call_for_content.haml
+++ b/app/views/conferences/_call_for_content.haml
@@ -1,6 +1,6 @@
 = content_for :splash_nav do
   %li
-    %a.smoothscroll{ href: '#call' } Call For Content
+    %a.smoothscroll{ href: '#call' } Call For Participation
 
 %section#call
   .container
diff --git a/app/views/conferences/_header.haml b/app/views/conferences/_header.haml
index 025009aa..23d6b4eb 100644
--- a/app/views/conferences/_header.haml
+++ b/app/views/conferences/_header.haml
@@ -11,7 +11,7 @@
             -#       id: 'splash-logo')
             .col-md-8.col-md-offset-2
               %h1
-                = conference.title
+                = conference.title.html_safe
               %h3
                 - if conference.start_date && conference.end_date
                   %span.date.text-nowrap
diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml
index deea4f09..e4be6e15 100644
--- a/app/views/layouts/_navigation.html.haml
+++ b/app/views/layouts/_navigation.html.haml
@@ -61,6 +61,7 @@
                     %small
                       %label{for: 'user_remember_me'} Remember me
                       = check_box_tag 'user[remember_me]'
+                  %br
                   %button.btn.btn-success.btn-block Sign in
                   - unless omniauth_configured.empty?
                     .divider
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index d4c194b9..d333a54d 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -1,10 +1,10 @@
-%html{xmlns: 'http://www.w3.org/1999/html'}
+%html{lang: 'en'}
   %head
     %meta{charset: 'utf-8'}
-    %meta{name: 'viewport', content: 'width=device-width, initial-scale=1, maximum-scale=1'}
+    %meta{name: 'viewport', content: 'width=device-width, initial-scale=1'}
     %title= content_for?(:title) ? yield(:title) : (ENV['OSEM_NAME'] || 'OSEM')
-    %meta{content: '', name: 'description'}
-    %meta{content: '', name: 'author'}
+    %meta{content: 'Snap!Con -- A conference all about Snap!, a programing language from UC Berkeley.', name: 'description'}
+    %meta{content: 'Michael Ball, Brian Harvey, Jens Moenig, Bernat Romagosa, Dan Garcia, Lauren Mock', name: 'author'}
     = stylesheet_link_tag "application", media: 'all'
     = javascript_include_tag "application"
 
@@ -45,7 +45,7 @@
             #{link_to "MIT license", "http://opensource.org/licenses/MIT"}.
             You can run, copy, distribute, study, change and improve it.
             The source code and the developers are on
-            #{link_to "GitHub", "https://github.com/openSUSE/osem"}.
+            #{link_to "GitHub", "https://github.com/snap-cloud/snapcon"}. This site is a modification of #{link_to "OSEM", "https://github.com/openSUSE/osem"}.
             - if ENV["SKYLIGHT_PUBLIC_DASHBOARD_URL"].present?
               Performance data is available on
               #{link_to "Skylight", ENV["SKYLIGHT_PUBLIC_DASHBOARD_URL"]}.