diff --git a/app/views/setup/variant.scala.html b/app/views/setup/variant.scala.html
index b235119f77..fca5a3d359 100644
--- a/app/views/setup/variant.scala.html
+++ b/app/views/setup/variant.scala.html
@@ -1,5 +1,5 @@
 @(form: Form[_], variants: List[(String, String, Option[String])])(implicit ctx: Context)
-<div class="label_select">
+<div class="variant label_select">
   <label for="variant">@trans.variant()</label>
   @setup.select(form("variant"), variants)
 </div>
diff --git a/public/javascripts/big.js b/public/javascripts/big.js
index 1d29e5b687..1df39a6d09 100644
--- a/public/javascripts/big.js
+++ b/public/javascripts/big.js
@@ -1169,12 +1169,12 @@ var storage = {
 
     function prepareForm() {
       var $form = $('div.lichess_overboard');
-      var $timeModeSelect = $form.find('.time_mode_choice select');
+      var $timeModeSelect = $form.find('#timeMode');
       var $modeChoicesWrap = $form.find('.mode_choice');
       var $modeChoices = $modeChoicesWrap.find('input');
       var $casual = $modeChoices.eq(0),
         $rated = $modeChoices.eq(1);
-      var $variantSelect = $form.find('.variants select');
+      var $variantSelect = $form.find('#variant');
       var $fenPosition = $form.find(".fen_position");
       var $timeInput = $form.find('.time_choice input');
       var $incrementInput = $form.find('.increment_choice input');
diff --git a/public/stylesheets/home.css b/public/stylesheets/home.css
index 8988ba3936..9d2798978a 100644
--- a/public/stylesheets/home.css
+++ b/public/stylesheets/home.css
@@ -508,10 +508,12 @@ div.game_config div.ui-slider {
   margin: 0 15px;
 }
 div.game_config .optional_config {
-  margin-bottom: 1em;
   padding: 8px 0;
   border-bottom: solid 1px #e4e4e4;
 }
+div.game_config .mode_choice {
+  margin-top: 1em;
+}
 div.game_config .optional_config,
 div.game_config .ratings {
   background: #f4f4f4;
@@ -523,10 +525,12 @@ div.game_config input[type="text"] {
   padding: 2px 3px;
 }
 div.game_config .label_select {
-  margin-bottom: 1em;
   overflow: hidden;
   text-align: left;
 }
+div.game_config .label_select.variant {
+  margin-bottom: 8px;
+}
 div.game_config .label_select label {
   display: block;
   float: left;