diff --git a/pages/rips/setup-rip.php b/pages/rips/setup-rip.php
index 47ec4c3..99511af 100644
--- a/pages/rips/setup-rip.php
+++ b/pages/rips/setup-rip.php
@@ -8,9 +8,9 @@ $config = $main->config();
 $encoded_filename = null;
 if ($req->get('submit')) {
     $encoded_filename = HandBrakeCluster_Main::issetelse($_POST['id'], HandBrakeCluster_Exception_InvalidParameters);
-    
+
     // Create the jobs from the request
-    $jobs = HandBrakeCluster_Job::fromPostRequest($_POST['id'], $_POST['rips']);
+    $jobs = HandBrakeCluster_Job::fromPostRequest($_POST['id'], $_POST['rip-options'], $_POST['rips']);
     
     // Spawn the background client process to run all the jobs
     HandBrakeCluster_Job::runAllJobs();
@@ -31,4 +31,4 @@ if ($req->get('submit')) {
     $this->smarty->assign('longest_title', $source->longestTitle());
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/styles/normal.css b/styles/normal.css
index 921efa9..86d8927 100644
--- a/styles/normal.css
+++ b/styles/normal.css
@@ -111,3 +111,8 @@ table#setup-rips input,select {
 #quantizer-slider {
 	width: 20em;	
 }
+
+select.rip-streams {
+    width: 20em;
+}
+
diff --git a/templates/rips/setup-rip.tpl b/templates/rips/setup-rip.tpl
index 244b052..f585cae 100644
--- a/templates/rips/setup-rip.tpl
+++ b/templates/rips/setup-rip.tpl
@@ -70,7 +70,7 @@
 
 						<div>		    			
 			    			<label for="rip-audio-{$title->id()}">Audio tracks</label>
-			    			<select id="rip-audio-{$title->id()}" name="rips[{$title->id()}][audio][]" size="5" multiple="multiple">
+			    			<select id="rip-audio-{$title->id()}" name="rips[{$title->id()}][audio][]" size="5" multiple="multiple" class="rip-streams">
 			    				{foreach from=$title->audioTracks() item=audio}
 			    					<option value="{$audio->id()}">{$audio->name()} - {$audio->channels()} ch ({$audio->language()}) </option>
 			    				{/foreach}
@@ -93,7 +93,7 @@
 		    		
 		    			<div>
 			    			<label for="rip-subtitle-{$title->id()}">Subtitle tracks</label>
-			    			<select id="rip-subtitle-{$title->id()}" name="rips[{$title->id()}][subtitles][]" size="5" multiple="multiple">
+			    			<select id="rip-subtitle-{$title->id()}" name="rips[{$title->id()}][subtitles][]" size="5" multiple="multiple" class="rip-streams">
 			    				{foreach from=$title->subtitleTracks() item=subtitle}
 			    					<option value="{$subtitle->id()}">{$subtitle->language()}</option>
 			    				{/foreach}
@@ -150,10 +150,10 @@
 			max: 1.0,
 			step: 0.01,
 			slide: function(event, ui) {
-				$("#output-quantizer").val(ui.value);
+				$("#global-quantizer").val(ui.value);
 			}
 		});
-		$("#output-quantizer").val($("#quantizer-slider").slider("value"));
+		$("#global-quantizer").val($("#quantizer-slider").slider("value"));
 	});
 	</script>
 	{/literal}