diff --git a/app/views/tables/_seat.html.haml b/app/views/tables/_seat.html.haml
index c17c899a..d35e790d 100644
--- a/app/views/tables/_seat.html.haml
+++ b/app/views/tables/_seat.html.haml
@@ -1,14 +1,13 @@
 - @game = seat.game
-.seat
+.seat{class: "position-#{@seats.index(seat) + 1}"}
   .seat-controls
     - if seat.occupied?
       - if seat.occupied_by? current_user
-        = button_to "Stand",
-          stand_seat_path(seat),
-          :data => { :confirm => 'Are you sure you want to leave this seat?' }
+        = button_to stand_seat_path(seat), :data => { :confirm => 'Are you sure you want to leave this seat?' } do
+          - "Stand"
     - else
-      = button_to "Sit",
-        sit_seat_path(seat)
+      = button_to sit_seat_path(seat) do
+        - "Sit"
           
   - if seat.player       
     .player{id: "player-#{seat.player.id}", class: @game.controlling_player == seat.player ? "taking-turn" : "",
diff --git a/spec/features/seats/seats_sit_spec.rb b/spec/features/seats/seats_sit_spec.rb
index 8ca90108..367e5b98 100644
--- a/spec/features/seats/seats_sit_spec.rb
+++ b/spec/features/seats/seats_sit_spec.rb
@@ -15,10 +15,13 @@ feature 'Seats', :devise, js: true do
     end
 
     it 'sit button is disabled for unavailable seats' do
+      @sit_buttons = page.find_all('button', text: 'Sit')
+      expect(@sit_buttons.length).to eq 4
       @button = page.find_button('Sit', match: :first)
       @button.click
       expect(page).to have_content "Guest"
-      expect(@button.disabled?).to eq true
+      @sit_buttons = page.find_all('button', text: 'Sit')
+      expect(@sit_buttons.length).to eq 3
     end
 
     it 'has a stand button if current user is seated' do
@@ -32,26 +35,25 @@ feature 'Seats', :devise, js: true do
     scenario 'table seats match up with game seats' do
       click_button 'Sit', match: :first
       expect(page).to have_content "Guest"
-      expect(page.find(:css, ".game-seat.position-1")).to have_content "Guest"
+      expect(page.find(:css, ".seat.position-1 .player")).to have_content "Guest"
       click_button 'Sit', match: :first
       expect(page).to have_content "Guest"
-      expect(page.find(:css, ".game-seat.position-2")).to have_content "Guest"
+      expect(page.find(:css, ".seat.position-2 .player")).to have_content "Guest"
     end
 
     #TODO: User can only occupy one seat per table
     scenario 'visitor changes seats' do
       click_button 'Sit', match: :first
       expect(page).to have_content "Guest"
-      expect(page.find(:css, ".game-seat.position-1")).to have_content "Guest"
+      expect(page.find(:css, ".seat.position-1")).to have_content "Guest"
       click_button 'Sit', match: :first
       expect(page).to have_content "Guest"
-      expect(page.find(:css, ".game-seat.position-2")).to have_content "Guest"
+      expect(page.find(:css, ".seat.position-2")).to have_content "Guest"
       expect(page.text.scan('Guest').count).to eq 1
     end
 
     scenario 'visitor can join the current game' do
       click_button 'Sit', match: :first
-      sleep 3
       expect(page).to have_content "Guest"
       expect(page.text.scan('Guest').count).to eq 1
     end
@@ -64,8 +66,10 @@ feature 'Seats', :devise, js: true do
       click_button 'Sit', match: :first
       expect(page).to have_content 'Guest'
       expect(page.text.scan('Guest').count).to eq 1
-      click_button 'Stand', match: :first
-      expect(page.find('.game-seat.position-1')).to have_content 'Sit'
+      accept_confirm do
+        click_button 'Stand', match: :first
+      end
+      expect(page.find('.seat.position-1')).to have_content 'Sit'
       expect(sit_buttons.length).to eq 4
       expect(page.text.scan('Guest').count).to eq 0
     end
@@ -95,8 +99,9 @@ feature 'Seats', :devise, js: true do
       click_button 'Sit', match: :first
       expect(page).to have_content @user.email
       expect(page.text.scan(@user.email).count).to eq 1
-      click_button 'Stand', match: :first
-      # sleep 1
+      accept_confirm do
+        click_button 'Stand', match: :first
+      end
       expect(page.text.scan(@user.email).count).to eq 0
     end
 
diff --git a/spec/features/users/sign_in_spec.rb b/spec/features/users/sign_in_spec.rb
index cf6cb597..2027aa53 100644
--- a/spec/features/users/sign_in_spec.rb
+++ b/spec/features/users/sign_in_spec.rb
@@ -9,8 +9,7 @@ feature 'Sign in', :devise do
   #   Then I see an invalid credentials message
   scenario 'user cannot sign in if not registered' do
     signin('test@example.com', 'password')
-    expect(page).to have_content
-      I18n.t 'devise.failure.not_found_in_database', authentication_keys: 'email'
+    expect(page).to have_content I18n.t 'devise.failure.not_found_in_database', authentication_keys: 'email'
   end
 
   # Scenario: User can sign in with valid credentials