12 files changed, 17 insertions, 3 deletions
diff --git a/web/templates/channel.html b/web/templates/channel.html
index d313b5395..d96aee3d4 100644
--- a/web/templates/channel.html
+++ b/web/templates/channel.html
@@ -1,4 +1,6 @@
+
 {{define "channel"}}
+<!DOCTYPE html>
 <html>
 {{template "head" . }}
 <body>
@@ -26,6 +28,7 @@
   <div id="edit_mention_tab"></div>
   <div id="get_link_modal"></div>
   <div id="user_settings_modal"></div>
+  <div id="team_settings_modal"></div>
   <div id="invite_member_modal"></div>
   <div id="edit_channel_modal"></div>
   <div id="delete_channel_modal"></div>
@@ -43,7 +46,7 @@
   <div id="direct_channel_modal"></div>
   <div id="channel_info_modal"></div>
 <script>
-window.setup_channel_page('{{ .Props.TeamName }}', '{{ .Props.TeamType }}', '{{ .Props.ChannelName }}', '{{ .Props.ChannelId }}');
+window.setup_channel_page('{{ .Props.TeamName }}', '{{ .Props.TeamType }}', '{{ .Props.TeamId }}', '{{ .Props.ChannelName }}', '{{ .Props.ChannelId }}');
 </script>
 </body>
 </html>
diff --git a/web/templates/find_team.html b/web/templates/find_team.html
index c731f7a8f..9acf3ac64 100644
--- a/web/templates/find_team.html
+++ b/web/templates/find_team.html
@@ -1,4 +1,5 @@
 {{define "find_team"}}
+<!DOCTYPE html>
 <html>
 {{template "head" . }}
 <body class="white">
diff --git a/web/templates/head.html b/web/templates/head.html
index 5eb7a7333..9c025d1f9 100644
--- a/web/templates/head.html
+++ b/web/templates/head.html
@@ -14,7 +14,7 @@
 
     <link id="favicon" rel="icon" href="/static/images/favicon.ico" type="image/x-icon">
     <link rel="shortcut icon" href="/static/images/favicon.ico" type="image/x-icon">
-    <link href='https://fonts.googleapis.com/css?family=Lato:400,700,900' rel='stylesheet' type='text/css'>
+    <link href='http://fonts.googleapis.com/css?family=Open+Sans:400,600,700' rel='stylesheet' type='text/css'>
     <link rel="stylesheet" href="/static/css/styles.css">
 
     <script src="/static/js/min/perfect-scrollbar.min.js"></script>
diff --git a/web/templates/home.html b/web/templates/home.html
index 74f7a015b..abf8062f2 100644
--- a/web/templates/home.html
+++ b/web/templates/home.html
@@ -1,4 +1,5 @@
 {{define "home"}}
+<!DOCTYPE html>
 <html>
 {{template "head" . }}
 <body>
diff --git a/web/templates/login.html b/web/templates/login.html
index 1bc5394ab..c107e1ad5 100644
--- a/web/templates/login.html
+++ b/web/templates/login.html
@@ -1,4 +1,5 @@
 {{define "login"}}
+<!DOCTYPE html>
 <html>
 {{template "head" . }}
 <body class="white">
diff --git a/web/templates/password_reset.html b/web/templates/password_reset.html
index 1c5485e33..8b63556b1 100644
--- a/web/templates/password_reset.html
+++ b/web/templates/password_reset.html
@@ -1,4 +1,5 @@
 {{define "password_reset"}}
+<!DOCTYPE html>
 <html>
 {{template "head" . }}
 <body class="white">
diff --git a/web/templates/signup_team.html b/web/templates/signup_team.html
index e2b9bc1ad..fad332bee 100644
--- a/web/templates/signup_team.html
+++ b/web/templates/signup_team.html
@@ -1,4 +1,5 @@
 {{define "signup_team"}}
+<!DOCTYPE html>
 <html>
 {{template "head" . }}
 <body class="white">
@@ -8,7 +9,8 @@
                 <div class="col-sm-12">
                     <div class="signup-team__container">
                         <img class="signup-team-logo" src="/static/images/logo.png" />
-                        <h4>{{ .SiteName }} is free for an unlimited time, for unlimited users. </h4>
+                        <h2>All team communication in one place, searchable and accessible anywhere</h2>
+                        <h4 class="text--light">{{ .SiteName }} is free for an unlimited time, for unlimited users </h4 class="text--light">
                         <div id="signup-team"></div>
                         <a class="signup-team-login" href="/login">or Sign In</a>
                     </div>
diff --git a/web/templates/signup_team_complete.html b/web/templates/signup_team_complete.html
index aad521cb3..59f49cdbd 100644
--- a/web/templates/signup_team_complete.html
+++ b/web/templates/signup_team_complete.html
@@ -1,4 +1,5 @@
 {{define "signup_team_complete"}}
+<!DOCTYPE html>
 <html>
 {{template "head" . }}
 <body class="white">
diff --git a/web/templates/signup_team_confirm.html b/web/templates/signup_team_confirm.html
index a34c39ab6..9e21126da 100644
--- a/web/templates/signup_team_confirm.html
+++ b/web/templates/signup_team_confirm.html
@@ -1,4 +1,5 @@
 {{define "signup_team_confirm"}}
+<!DOCTYPE html>
 <html>
 {{template "head" . }}
 <body class="white">
diff --git a/web/templates/signup_user_complete.html b/web/templates/signup_user_complete.html
index a6827bc3a..5fe907ba7 100644
--- a/web/templates/signup_user_complete.html
+++ b/web/templates/signup_user_complete.html
@@ -1,4 +1,5 @@
 {{define "signup_user_complete"}}
+<!DOCTYPE html>
 <html>
 {{template "head" . }}
 <body class="white">
diff --git a/web/templates/verify.html b/web/templates/verify.html
index 60a7990f0..a61964bb3 100644
--- a/web/templates/verify.html
+++ b/web/templates/verify.html
@@ -1,4 +1,5 @@
 {{define "verify"}}
+<!DOCTYPE html>
 <html>
 {{template "head" . }}
 <body>
diff --git a/web/templates/welcome.html b/web/templates/welcome.html
index 27bf4bcaf..bab7a135d 100644
--- a/web/templates/welcome.html
+++ b/web/templates/welcome.html
@@ -1,4 +1,5 @@
 {{define "welcome"}}
+<!DOCTYPE html>
 <html>
 {{template "head" . }}
 <body>