diff --git a/core/modules/views_ui/css/views-admin.theme.css b/core/modules/views_ui/css/views-admin.theme.css
index 2919c1d..9675921 100644
--- a/core/modules/views_ui/css/views-admin.theme.css
+++ b/core/modules/views_ui/css/views-admin.theme.css
@@ -408,7 +408,8 @@ td.group-title {
   padding-bottom: 36px;
 }
 
-.views-display-top {
+.views-display-top,
+#views-preview-wrapper {
   background-color: #e1e2dc;
   border-bottom: 1px solid #ccc;
   padding: 8px 8px 8px; /* LTR */
@@ -573,8 +574,8 @@ ul#views-display-menu-tabs li.add ul.action-list li{
  * The auto-preview checkbox line.
  */
 
-#views-ui-preview-form #edit-controls div {
-  float: left;
+#views-ui-preview-form h2.title {
+  display: inline;
 }
 
 #views-ui-preview-form #edit-controls .arguments-preview {
@@ -599,8 +600,7 @@ ul#views-display-menu-tabs li.add ul.action-list li{
 }
 
 .form-item-live-preview,
-.form-item-view-args,
-#preview-submit-wrapper {
+.form-item-view-args {
   display: inline-block;
 }
 
@@ -608,8 +608,9 @@ ul#views-display-menu-tabs li.add ul.action-list li{
   max-width: 42em;
 }
 
-.form-item-live-preview,
-#preview-submit-wrapper {
+.form-item.form-item-live-preview {
+  float: right;
+  margin-top: 0;
   vertical-align: top;
 }
 
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php b/core/modules/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php
index bbf0c07..7fb7a99 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php
@@ -26,7 +26,7 @@ public function form(array $form, array &$form_state) {
       '#type' => 'container',
     );
     $form['controls']['title'] = array(
-      '#markup' => '<h2>' . t('Preview') . '</h2>',
+      '#markup' => '<h2 class="title">' . t('Preview') . '</h2>',
     );
 
     // Reset the cache of IDs. Drupal rather aggressively prevents ID
@@ -40,7 +40,7 @@ public function form(array $form, array &$form_state) {
     $form['controls']['#attributes'] = array('class' => array('clearfix'));
 
     // Add the arguments textfield
-    $form['controls']['view_args'] = array(
+    $form['view_args'] = array(
       '#type' => 'textfield',
       '#title' => t('Apply contextual filters'),
       '#description' => t('For multiple filters, separate values with a "/". Example: %example', array('%example' => '40/12/10')),