diff --git a/app/controllers/rooms_controller.rb b/app/controllers/rooms_controller.rb
index 7456cee2..0ea61536 100644
--- a/app/controllers/rooms_controller.rb
+++ b/app/controllers/rooms_controller.rb
@@ -11,8 +11,13 @@ class RoomsController < ApplicationController
     room.user = current_user
 
     if room.save
-      redirect_to room
+      if room_params[:auto_join] == "1"
+        redirect_to start_room_path(room)
+      else
+        redirect_to room
+      end
     else
+      # Handle room didn't save.
 
     end
   end
@@ -45,6 +50,13 @@ class RoomsController < ApplicationController
     end
   end
 
+  # DELETE /r/:room_uid
+  def destroy
+    @room.destroy
+
+    redirect_to root_path
+  end
+
   # GET /r/:room_uid/start
   def start
     # Join the user in and start the meeting.
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index f04e4d32..2dcca813 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -38,7 +38,6 @@
       <% if current_user %>
         <%= render "shared/modals/create_room_modal" %>
       <% end %>
-      
     </div>
   </body>
 </html>
diff --git a/app/views/shared/components/_room_block.html.erb b/app/views/shared/components/_room_block.html.erb
index babda55c..c233df59 100644
--- a/app/views/shared/components/_room_block.html.erb
+++ b/app/views/shared/components/_room_block.html.erb
@@ -8,7 +8,7 @@
         <td>
           <div><%= room.name %></div>
           <div class="small text-muted">
-            <i>Created on <%= room.created_at.strftime("%B #{room.created_at.day.ordinalize}, %Y") %></i>
+            <i>Created on <%= room.created_at.strftime("%B #{room.created_at.day.ordinalize}, %Y.") %></i>
           </div>
         </td>
         <td class="text-right">
@@ -17,7 +17,9 @@
             <div class="dropdown-menu dropdown-menu-right">
               <a href="javascript:void(0)" class="dropdown-item"><i class="dropdown-icon fe fe-tag"></i> Action </a>
               <a href="javascript:void(0)" class="dropdown-item"><i class="dropdown-icon fe fe-edit-2"></i> Another action </a>
-              <a href="javascript:void(0)" class="dropdown-item"><i class="dropdown-icon fe fe-trash"></i> Delete</a>
+              <%= button_to room, method: :delete, data: { confirm: 'Are you sure?' }, class: "dropdown-item" do %>
+                <i class="dropdown-icon fe fe-trash"></i> Delete
+              <% end %>
             </div>
           </div>
         </td>
diff --git a/app/views/shared/modals/_create_room_modal.html.erb b/app/views/shared/modals/_create_room_modal.html.erb
index dbe9df77..b0bb0987 100644
--- a/app/views/shared/modals/_create_room_modal.html.erb
+++ b/app/views/shared/modals/_create_room_modal.html.erb
@@ -8,7 +8,7 @@
           </div>
 
           <hr class="small-rule">
-          <%= form_for(:room, url: create_room_path) do |f| %>
+          <%= form_for(:room, url: rooms_path) do |f| %>
             <div class="input-icon">
               <span class="input-icon-addon">
                 <i class="fas fa-chalkboard-teacher"></i>
diff --git a/config/routes.rb b/config/routes.rb
index bc28887b..01d73479 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,15 +1,13 @@
 Rails.application.routes.draw do
 
+  resources :rooms, only: [:create, :show, :destroy], param: :room_uid, path: '/r'
+
   # Room routes.
-  scope '/r' do
-    post '/', to: 'rooms#create', as: :create_room
-    scope '/:room_uid' do
-      match '/', to: 'rooms#show', as: :room, via: [:get, :post]
-      get '/start', to: 'rooms#start', as: :start_room
-      match '/wait', to: 'rooms#wait', as: :wait_room, via: [:get, :post]
-      get '/logout', to: 'rooms#logout', as: :logout_room
-      get '/sessions', to: 'rooms#sessions', as: :sessions
-    end
+  scope '/r/:room_uid' do
+    get '/start', to: 'rooms#start', as: :start_room
+    match '/wait', to: 'rooms#wait', as: :wait_room, via: [:get, :post]
+    get '/logout', to: 'rooms#logout', as: :logout_room
+    get '/sessions', to: 'rooms#sessions', as: :sessions
   end
 
   # Signup routes.