diff --git a/templates/default/admin.html.ep b/templates/default/admin.html.ep
index c05e2e1..467b2af 100644
--- a/templates/default/admin.html.ep
+++ b/templates/default/admin.html.ep
@@ -3,7 +3,7 @@
%= include 'public_toolbar'
diff --git a/templates/default/error.html.ep b/templates/default/error.html.ep
index 0ece6a9..c789fd5 100644
--- a/templates/default/error.html.ep
+++ b/templates/default/error.html.ep
@@ -11,21 +11,21 @@
<% if ($err eq 'ERROR_ROOM_s_DOESNT_EXIST'){ %>
-
<% } %>
diff --git a/templates/default/feedback.html.ep b/templates/default/feedback.html.ep
index 22795dd..d9645f8 100644
--- a/templates/default/feedback.html.ep
+++ b/templates/default/feedback.html.ep
@@ -3,7 +3,7 @@
%= include 'public_toolbar'
diff --git a/templates/default/goodbye.html.ep b/templates/default/goodbye.html.ep
index 7a23946..187bedf 100644
--- a/templates/default/goodbye.html.ep
+++ b/templates/default/goodbye.html.ep
@@ -12,12 +12,12 @@
diff --git a/templates/default/header.html.ep b/templates/default/header.html.ep
index 5145e6b..a4134fe 100644
--- a/templates/default/header.html.ep
+++ b/templates/default/header.html.ep
@@ -6,7 +6,7 @@
<% my @css = qw(css/bootstrap.css css/bootstrap-switch.css css/toc-scroll.css css/vroom.css); %>
<%=css @css %>
-
+
diff --git a/templates/default/invitation.html.ep b/templates/default/invitation.html.ep
index 0ee2a83..2634b28 100644
--- a/templates/default/invitation.html.ep
+++ b/templates/default/invitation.html.ep
@@ -37,7 +37,7 @@
<%=l 'CLICK_SEND_OR_JOIN_NOW' %>
-
+ <% if ($token ne ''){ %>?token=<%= $token %><% } %>">
<%=l 'JOIN_THIS_ROOM' %>
diff --git a/templates/default/join.html.ep b/templates/default/join.html.ep
index 8f53aa2..cc0c816 100644
--- a/templates/default/join.html.ep
+++ b/templates/default/join.html.ep
@@ -230,7 +230,7 @@
<%=l 'CLICK_IF_NO_WEBCAM' %>
-
+ ?video=false">
@@ -254,7 +254,7 @@
-
+
<%=l 'CANCEL' %>
@@ -326,7 +326,7 @@
-
+
diff --git a/templates/default/js_common.html.ep b/templates/default/js_common.html.ep
index ddd604c..8d143ef 100644
--- a/templates/default/js_common.html.ep
+++ b/templates/default/js_common.html.ep
@@ -1,5 +1,7 @@