diff --git a/app/views/rooms/components/_room_event.html.erb b/app/views/rooms/components/_room_event.html.erb
index bf01835c..45adc4da 100644
--- a/app/views/rooms/components/_room_event.html.erb
+++ b/app/views/rooms/components/_room_event.html.erb
@@ -24,7 +24,7 @@
     </div>
 
     <div class="row">
-      <div class="col-lg-6 col-md-8 col-sm-12 form-inline mb-5 align-top">
+      <div class="col-lg-6 col-md-6 col-sm-12 form-inline mb-5 align-top">
         <% if @room.owner.image.blank? %>
           <span class="avatar"><%= @room.owner.name.first %></span>
         <% else %>
@@ -33,7 +33,7 @@
         <h5 class="font-weight-normal ml-4 mt-3"><%= @room.owner.name %> (<%= t("room.owner") %>)</h5>
       </div>
 
-      <div class="col-lg-6 col-md-4 col-sm-12">
+      <div class="col-lg-6 col-md-6 col-sm-12">
         <%= yield %>
       </div>
     </div>
diff --git a/app/views/rooms/join.html.erb b/app/views/rooms/join.html.erb
index 84cb6e88..332c5734 100644
--- a/app/views/rooms/join.html.erb
+++ b/app/views/rooms/join.html.erb
@@ -31,7 +31,7 @@
     <% end %>
   <% else %>
     <%= form_for room_path(@room), method: :post do |f| %>
-      <div class="input-group join-input">
+      <div class="input-group">
         <%= f.hidden_field(:search, :value => params[:search])%>
         <%= f.hidden_field(:column, :value => params[:column])%>
         <%= f.hidden_field(:direction, :value => params[:direction])%>
@@ -43,7 +43,11 @@
             readonly: !current_user.nil?, 
             autofocus: true
             %>
-        <%= f.submit (!@room_running && @anyone_can_start)? t("room.start") : t("room.join"), class: "btn btn-primary btn-sm col-sm-3 form-control join-form" %>
+        <span class="input-group-append">
+          <button type="submit" class="btn btn-primary btn-sm px-7 form-control join-form">
+            <%= (!@room_running && @anyone_can_start) ? t("room.start") : t("room.join") %>
+          </button>
+        </span>
       </div>
     <% end %>
   <% end %>