diff --git a/admin/dataoutput.php b/admin/dataoutput.php
index f7cd3a82..a1e7cb32 100644
--- a/admin/dataoutput.php
+++ b/admin/dataoutput.php
@@ -202,7 +202,7 @@ xhtml_head(T_("Data output"),true,array("../include/bootstrap/css/bootstrap.min.
 print "<div class='form-group clearfix'><h3 class='col-sm-4 text-right'>" . T_("Please select a questionnaire") . ":&emsp;</h3>";
 $questionnaire_id = false;
 if (isset($_GET['questionnaire_id'])) $questionnaire_id = bigintval($_GET['questionnaire_id']);
-display_questionnaire_chooser($questionnaire_id,false,"form-inline col-sm-3 pull-left", "form-control");
+display_questionnaire_chooser($questionnaire_id,false,"form-inline col-lg-4 pull-left", "form-control");
 
 if ($questionnaire_id)
 {
@@ -218,7 +218,7 @@ if ($questionnaire_id)
 	print "<div class='form-group clearfix'><h3 class='col-sm-4 text-right'>" . T_("Please select a sample") . ":&emsp;</h3>";
 	$sample_import_id = false;
 	if (isset($_GET['sample_import_id'])) $sample_import_id = bigintval($_GET['sample_import_id']);
-	display_sample_chooser($questionnaire_id,$sample_import_id,false,"form-inline col-sm-3 pull-left", "form-control");
+	display_sample_chooser($questionnaire_id,$sample_import_id,false,"form-inline col-lg-4 pull-left", "form-control");
 
 	if ($sample_import_id)
 	{
@@ -232,7 +232,7 @@ if ($questionnaire_id)
 		//download a key file linking the caseid to the sample
 		print "<div class='form-group '><h3 class='col-sm-4 text-right'>" . T_("Download key file: select sample var") . ":&emsp;</h3>";
 
-		display_chooser($rs,"sample_var","sample_var",true,"questionnaire_id=$questionnaire_id&amp;sample_import_id=$sample_import_id",true,true,false,true,"form-inline col-sm-3 pull-left");
+		display_chooser($rs,"sample_var","sample_var",true,"questionnaire_id=$questionnaire_id&amp;sample_import_id=$sample_import_id",true,true,false,true,"form-inline col-lg-4 pull-left");
 		
 		print "</div><div class=' col-sm-4'>";
 		
diff --git a/admin/quotarow.php b/admin/quotarow.php
index 4f8e087c..bbddd079 100755
--- a/admin/quotarow.php
+++ b/admin/quotarow.php
@@ -309,7 +309,7 @@ if ($questionnaire_id != false)
 		AND s.enabled = 1";
 	$s = $db->GetAll($sql);
 	if (!empty($s)){
-		print "<h3 class='form-inline pull-left'>&emsp;&emsp;&emsp;" . T_("Sample") . ":&emsp;</h3>";
+		print "<h3 class='form-inline pull-left'>&emsp;" . T_("Sample") . ":&emsp;</h3>";
 
 	display_chooser($s,"sample","sample_import_id",true,"questionnaire_id=$questionnaire_id",true,true,false,true,"pull-left");
 	} else {	
diff --git a/functions/functions.operator.php b/functions/functions.operator.php
index 83758839..6aa06819 100644
--- a/functions/functions.operator.php
+++ b/functions/functions.operator.php
@@ -57,9 +57,9 @@ function sRandomChars($length = 15,$pattern="23456789abcdefghijkmnpqrstuvwxyz")
     for($i=0;$i<$length;$i++)
     {   
         if(isset($key))
-            $key .= $pattern{mt_rand(0,$patternlength)};
+            $key .= $pattern{mt_rand(0,$patternlength)};
         else
-            $key = $pattern{mt_rand(0,$patternlength)};
+            $key = $pattern{mt_rand(0,$patternlength)};
     }
     return $key;
 }
@@ -354,19 +354,19 @@ function add_case($sample_id,$questionnaire_id,$operator_id = "NULL",$testing =
 {
 	global $db;
 
-	$ttries = 0;
-	
-	do {
+	$ttries = 0;
+	
+	do {
 	$token = sRandomChars();
 
-		$sql = "SELECT count(*) as c
-			FROM `case`
-			WHERE token = '$token'";
-
-		$ttries++;
-	} while ($db->GetOne($sql) > 0 && $ttries < 10);
-	
-
+		$sql = "SELECT count(*) as c
+			FROM `case`
+			WHERE token = '$token'";
+
+		$ttries++;
+	} while ($db->GetOne($sql) > 0 && $ttries < 10);
+	
+
 	$sql = "INSERT INTO `case` (case_id, sample_id, questionnaire_id, last_call_id, current_operator_id, current_call_id, current_outcome_id,token)
 		VALUES (NULL, $sample_id, $questionnaire_id, NULL, $operator_id, NULL, '$current_outcome_id','$token')";
 
@@ -727,7 +727,7 @@ function get_case_id($operator_id, $create = false)
 			}
 			$r2 = $db->GetRow($sql);
 	
-	
+	
 			if (empty($r2))
 			{