diff --git a/admin/index.php b/admin/index.php
index e87ad6d0..8e002ef1 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -44,64 +44,69 @@ include ("../config.inc.php");
  */
 include ("../functions/functions.xhtml.php");
 
-xhtml_head(T_("Administrative Tools"),true,array("../css/table.css","../css/admin.css"),array("../js/link.js"));
+xhtml_head(T_("Administrative Tools"),true,array("../css/table.css","../css/admin.css"));
 
 print "<div id='menu'><ul class='navmenu'>";
 
 print "<li><h3>" . T_("Questionnaire creation and management") . "</h3>";
-print "<ul><li><a href=\"javascript:link('mainobj','new.php');\">" . T_("Create a new questionnaire") . "</a></li>";
-print "<li><a href=\"javascript:link('mainobj','" . LIME_URL . "admin/admin.php');\">" . T_("Administer questionnaires with Limesurvey") . "</a></li>";
-print "<li><a href=\"javascript:link('mainobj','import.php');\">" . T_("Import a sample file (in CSV form)") . "</a></li>";
-print "<li><a href=\"javascript:link('mainobj','assignsample.php');\">" . T_("Assign samples to questionnaires") . "</a></li>";
-print "<li><a href=\"javascript:link('mainobj','questionnaireprefill.php');\">" . T_("Set values in questionnaire to pre fill") . "</a></li>";
-print "<li><a href=\"javascript:link('mainobj','quota.php');\">" . T_("Quota management") . "</a></li>";
-print "<li><a href=\"javascript:link('mainobj','quotarow.php');\">" . T_("Quota row management") . "</a></li>";
-print "<li><a href=\"javascript:link('mainobj','operators.php');\">" . T_("Add operators to the system") . "</a></li>";
-print "<li><a href=\"javascript:link('mainobj','operatorlist.php');\">" . T_("Operator management") . "</a></li>";
-print "<li><a href=\"javascript:link('mainobj','operatorquestionnaire.php');\">" . T_("Assign operators to questionnaires") . "</a></li>";
-print "<li><a href=\"javascript:link('mainobj','operatorskill.php');\">" . T_("Modify operator skills") . "</a></li>";
-print "<li><a href=\"javascript:link('mainobj','addshift.php');\">" . T_("Shift management (add/remove)") . "</a></li>";
-print "<li><a href=\"javascript:link('mainobj','dataoutput.php');\">" . T_("Data output") . "</a></li></ul></li>";
+print "<ul><li><a href=\"?page=new.php\">" . T_("Create a new questionnaire") . "</a></li>";
+print "<li><a href=\"?page=" . LIME_URL . "admin/admin.php\">" . T_("Administer questionnaires with Limesurvey") . "</a></li>";
+print "<li><a href=\"?page=import.php\">" . T_("Import a sample file (in CSV form)") . "</a></li>";
+print "<li><a href=\"?page=assignsample.php\">" . T_("Assign samples to questionnaires") . "</a></li>";
+print "<li><a href=\"?page=questionnaireprefill.php\">" . T_("Set values in questionnaire to pre fill") . "</a></li>";
+print "<li><a href=\"?page=quota.php\">" . T_("Quota management") . "</a></li>";
+print "<li><a href=\"?page=quotarow.php\">" . T_("Quota row management") . "</a></li>";
+print "<li><a href=\"?page=operators.php\">" . T_("Add operators to the system") . "</a></li>";
+print "<li><a href=\"?page=operatorlist.php\">" . T_("Operator management") . "</a></li>";
+print "<li><a href=\"?page=operatorquestionnaire.php\">" . T_("Assign operators to questionnaires") . "</a></li>";
+print "<li><a href=\"?page=operatorskill.php\">" . T_("Modify operator skills") . "</a></li>";
+print "<li><a href=\"?page=addshift.php\">" . T_("Shift management (add/remove)") . "</a></li>";
+print "<li><a href=\"?page=dataoutput.php\">" . T_("Data output") . "</a></li></ul></li>";
 
 print "<li><h3>" . T_("Questionnaire progress") . "</h3>";
-print "<ul><li><a href=\"javascript:link('mainobj','displayappointments.php');\">" . T_("Display all future appointments") . "</a></li>";
-print "<li><a href=\"javascript:link('mainobj','samplecallattempts.php');\">" . T_("Sample call attempts report") . "</a></li>";
-print "<li><a href=\"javascript:link('mainobj','quotareport.php');\">" . T_("Quota report") . "</a></li>";
-print "<li><a href=\"javascript:link('mainobj','outcomes.php');\">" . T_("Questionnaire outcomes") . "</a></li></ul></li>";
+print "<ul><li><a href=\"?page=displayappointments.php\">" . T_("Display all future appointments") . "</a></li>";
+print "<li><a href=\"?page=samplecallattempts.php\">" . T_("Sample call attempts report") . "</a></li>";
+print "<li><a href=\"?page=quotareport.php\">" . T_("Quota report") . "</a></li>";
+print "<li><a href=\"?page=outcomes.php\">" . T_("Questionnaire outcomes") . "</a></li></ul></li>";
 
 print "<li><h3>" . T_("Performance") . "</h3>";
-print "<ul><li><a href=\"javascript:link('mainobj','operatorperformance.php');\">" . T_("Operator performance") . "</a></li></ul></li>";
+print "<ul><li><a href=\"?page=operatorperformance.php\">" . T_("Operator performance") . "</a></li></ul></li>";
 
 print "<li><h3>" . T_("Client management") . "</h3>";
-print "<ul><li><a href=\"javascript:link('mainobj','clients.php');\">" . T_("Add clients to the system") . "</a></li>";
-print "<li><a href=\"javascript:link('mainobj','clientquestionnaire.php');\">" . T_("Assign clients to questionnaires") . "</a></li></ul></li>";
+print "<ul><li><a href=\"?page=clients.php\">" . T_("Add clients to the system") . "</a></li>";
+print "<li><a href=\"?page=clientquestionnaire.php\">" . T_("Assign clients to questionnaires") . "</a></li></ul></li>";
 
 print "<li><h3>" . T_("Supervisor functions") . "</h3>";
-print "<ul><li><a href=\"javascript:link('mainobj','supervisor.php');\">" . T_("Assign outcomes to cases") . "</a></li>";
-print "<li><a href=\"javascript:link('mainobj','samplesearch.php');\">" . T_("Search the sample") . "</a></li>";
-print "<li><a href=\"javascript:link('mainobj','callhistory.php');\">" . T_("Call history") . "</a></li>";
-print "<li><a href=\"javascript:link('mainobj','shiftreport.php');\">" . T_("Shift reports") . "</a></li></ul></li>";
+print "<ul><li><a href=\"?page=supervisor.php\">" . T_("Assign outcomes to cases") . "</a></li>";
+print "<li><a href=\"?page=samplesearch.php\">" . T_("Search the sample") . "</a></li>";
+print "<li><a href=\"?page=callhistory.php\">" . T_("Call history") . "</a></li>";
+print "<li><a href=\"?page=shiftreport.php\">" . T_("Shift reports") . "</a></li></ul></li>";
 
 print "<li><h3>" . T_("System settings") . "</h3>";
-print "<ul><li><a href=\"javascript:link('mainobj','timezonetemplate.php');\">" . T_("Set default timezone list") . "</a></li>";
-print "<li><a href=\"javascript:link('mainobj','shifttemplate.php');\">" . T_("Set default shift times") . "</a></li>";
-print "<li><a href=\"javascript:link('mainobj','callrestrict.php');\">" . T_("Set call restriction times") . "</a></li></ul></li>";
+print "<ul><li><a href=\"?page=timezonetemplate.php\">" . T_("Set default timezone list") . "</a></li>";
+print "<li><a href=\"?page=shifttemplate.php\">" . T_("Set default shift times") . "</a></li>";
+print "<li><a href=\"?page=callrestrict.php\">" . T_("Set call restriction times") . "</a></li></ul></li>";
 
 if (VOIP_ENABLED)
 {
 	print "<li><h3>" . T_("VoIP") . "</h3>";
-	print "<ul><li><a href=\"javascript:link('mainobj','voipmonitor.php');\">" . T_("Start and monitor VoIP") . "</a></li>";
-	print "<li><a href=\"javascript:link('mainobj','operatorlist.php');\">" . T_("Operator management") . "</a></li>";
-	print "<li><a href=\"javascript:link('mainobj','extensionstatus.php');\">" . T_("Extension status") . "</a></li></ul></li>";
+	print "<ul><li><a href=\"?page=voipmonitor.php\">" . T_("Start and monitor VoIP") . "</a></li>";
+	print "<li><a href=\"?page=operatorlist.php\">" . T_("Operator management") . "</a></li>";
+	print "<li><a href=\"?page=extensionstatus.php\">" . T_("Extension status") . "</a></li></ul></li>";
 }
 
 print "</ul></div>";
 
+$page = "new.php";
 
-print "<div id='main'><object class='embeddedobject' id='mainobj' data='new.php' standby='Loading panel...' type='application/xhtml+xml'><p>Error, try with Firefox</p></object></div>";
+if (isset($_GET['page']))
+	$page = $_GET['page'];
+
+print "<div id='main'>";
+xhtml_object($page,"mainobj");
+print "</div>";
 
 
 xhtml_foot();
 
 ?>
-
diff --git a/admin/operatorlist.php b/admin/operatorlist.php
index 7ec3c185..c3e7c4f1 100644
--- a/admin/operatorlist.php
+++ b/admin/operatorlist.php
@@ -113,9 +113,9 @@ if (isset($_GET['operator_id']))
 			header("Pragma: public");                          // HTTP/1.0
 	
 			if (isset($_GET['winbat']))
-				echo "voip.exe -i -u {$rs['ext']} -p {$rs['extension_password']} -h " . VOIP_SERVER;
+				echo "voipclient.exe -i -u {$rs['ext']} -p {$rs['extension_password']} -h " . $_SERVER['SERVER_ADDR'];
 			else
-				echo "./voip -i -u {$rs['ext']} -p {$rs['extension_password']} -h " . VOIP_SERVER;
+				echo "./voipclient -i -u {$rs['ext']} -p {$rs['extension_password']} -h " . $_SERVER['SERVER_ADDR'];
 		}
 	}
 }
@@ -132,22 +132,23 @@ if ($display)
 			ELSE
 				CONCAT('<a href=\'?disable=',operator_id,'\'>" . T_("Disable") . "</a>') 
 			END
-			as enabledisable
+			as enabledisable,
+			username
 		FROM operator";
 	
 	$rs = $db->GetAll($sql);
 	
 	xhtml_head(T_("Operator list"),true,array("../css/table.css"));
 	
-	$columns = array("name","enabledisable");
-	$titles = array(T_("Operator"),T_("Enable/Disable"));
+	$columns = array("name","username","enabledisable");
+	$titles = array(T_("Operator"),T_("Username"),T_("Enable/Disable"));
 
 	if (VOIP_ENABLED)
 	{
 		print "<p>" . T_("Download the file for each user and save in the same folder as the voip.exe executable. When the file is executed, it will run the voip.exe program with the correct connection details to connect the operator to the VoIP server") . "</p>";
 	
-		print "<p><a href='voip.exe'>" . T_("Download Windows VoIP Executable")  . "</a></p>";
-		print "<p><a href='voip'>" . T_("Download Linux VoIP Executable")  . "</a></p>";
+		print "<p><a href='../voipclient.exe'>" . T_("Download Windows VoIP Executable")  . "</a></p>";
+		print "<p><a href='../voipclient'>" . T_("Download Linux VoIP Executable")  . "</a></p>";
 
 		$columns[] = "winbat";
 		$columns[] = "sh";
diff --git a/call.php b/call.php
index ddfba7dc..dbe6cdcf 100644
--- a/call.php
+++ b/call.php
@@ -172,7 +172,10 @@ if (isset($_POST['submit']))
 				$btext = "onload='openParentObject(\"main-content\",\"" . get_respondentselection_url($operator_id) . "\"); parent.closePopup();'";
 			else
 				$btext = "onload='parent.closePopup();'";
-			xhtml_head(T_("Call"),true,array("css/call.css"),array("js/window.js"),$btext);
+
+			$js = "js/window.js";
+			if (browser_ie()) $js = "js/window_ie6.js";
+			xhtml_head(T_("Call"),true,array("css/call.css"),array($js),$btext);
 		}
 	}
 	else if (isset($_POST['outcome']))
@@ -188,7 +191,11 @@ if (isset($_POST['submit']))
 		}
 		//disable recording
 		$newtext = T_("Start REC");
-		xhtml_head(T_("Call"),true,array("css/call.css"),array("js/window.js"),"onload='toggleRec(\"$newtext\",\"record.php?start=start\",\"offline\"); openParentObject(\"main-content\",\"" . get_respondentselection_url($operator_id) . "\"); parent.closePopup();'");
+
+		$js = "js/window.js";
+		if (browser_ie()) $js = "js/window_ie6.js";
+
+		xhtml_head(T_("Call"),true,array("css/call.css"),array($js),"onload='toggleRec(\"$newtext\",\"record.php?start=start\",\"offline\"); openParentObject(\"main-content\",\"" . get_respondentselection_url($operator_id) . "\"); parent.closePopup();'");
 	}
 	else
 	{
@@ -202,7 +209,9 @@ if (isset($_POST['submit']))
 		}
 		//disable recording
 		$newtext = T_("Start REC");
-		xhtml_head(T_("Call"),true,array("css/call.css"),array("js/window.js"),"onload='toggleRec(\"$newtext\",\"record.php?start=start\",\"offline\"); openParentObject(\"main-content\",\"" . get_respondentselection_url($operator_id) . "\"); parent.closePopup();'");
+		$js = "js/window.js";
+		if (browser_ie()) $js = "js/window_ie6.js";
+		xhtml_head(T_("Call"),true,array("css/call.css"),array($js),"onload='toggleRec(\"$newtext\",\"record.php?start=start\",\"offline\"); openParentObject(\"main-content\",\"" . get_respondentselection_url($operator_id) . "\"); parent.closePopup();'");
 
 	}
 
@@ -230,8 +239,10 @@ if (isset($_GET['newstate']))
 	$db->Execute($sql);
 }
 
+$js = "js/window.js";
+if (browser_ie()) $js = "js/window_ie6.js";
 
-xhtml_head(T_("Call"),true,array("css/call.css"),array("js/window.js","include/jquery-ui/js/jquery-1.4.2.min.js"));
+xhtml_head(T_("Call"),true,array("css/call.css"),array($js,"include/jquery-ui/js/jquery-1.4.2.min.js"));
 
 $state = is_on_call($operator_id);
 switch($state)
diff --git a/css/admin.css b/css/admin.css
index 0c68ba43..d8be7d7a 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -15,7 +15,7 @@
 }
 
 #menu {
-  position : fixed;
+  position : absolute;
   width : 20%;
   height : 100%;
   top : 0;
@@ -27,7 +27,7 @@
 /*border-bottom: 1px solid #aaa;*/
 }
 #main {
-  position : fixed;
+  position : absolute;
   top : 0;
   left : 20%;
   bottom : auto;
diff --git a/css/index.css b/css/index.css
index 8cf8e315..6597b1e8 100644
--- a/css/index.css
+++ b/css/index.css
@@ -20,7 +20,7 @@ a:active {
 }
 
 #respondent {
-  position : fixed;
+  position : absolute;
   width : 20%;
   height : 30%;
   top : 0;
@@ -30,7 +30,7 @@ a:active {
 }
 
 #header {
-  position : fixed;
+  position : absolute;
   width : 20%;
   height : 30%;
   top : 0;
@@ -40,7 +40,7 @@ a:active {
   /*border-bottom: 1px solid #aaa;*/
 }
 #calllist {
-  position : fixed;
+  position : absolute;
   width : 60%;
   height : 30%;
   top : 0;
@@ -48,7 +48,7 @@ a:active {
   bottom : auto;
 }
 #qstatus {
-  position : fixed;
+  position : absolute;
   width : 10%;
   height : 30%;
   top : 0;
@@ -58,7 +58,7 @@ a:active {
   /*border: 1px solid #aaa;*/
 }
 #casefunctions {
-  position : fixed;
+  position : absolute;
   width : 10%;
   height : 30%;
   top : 0;
@@ -67,7 +67,7 @@ a:active {
   bottom : auto;
 }
 #content {
-  position : fixed;
+  position : absolute;
   top : 30%;
   left : 0;
   bottom : auto;
diff --git a/functions/functions.xhtml.php b/functions/functions.xhtml.php
index b73a93f9..4651887f 100644
--- a/functions/functions.xhtml.php
+++ b/functions/functions.xhtml.php
@@ -199,6 +199,26 @@ function display_chooser($elements, $selectid, $var, $useblank = true, $pass = f
 	if ($indiv) print "</div>";
 }
 
+function xhtml_object($data, $id, $class="embeddedobject")
+{
+	if (browser_ie())
+		print '<iframe class="'.$class.'" id="'.$id.'" src="'.$data.'" frameBorder="0"><p>Error, try with Firefox</p></iframe>';
+	else
+		print '<object class="'.$class.'" id="'.$id.'" data="'.$data.'" standby="Loading panel..." type="application/xhtml+xml"><p>Error, try with Firefox</p></object>';
+}
+
+/**
+ * Detect if the user is running on internet explorer
+ *
+ * @return bool True if MSIE is detected otherwise false
+ */
+function browser_ie()
+{
+    if (isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false))
+        return true;
+    else
+        return false;
+}
 
 
 ?>
diff --git a/index.php b/index.php
index 5c19c038..dcdb44ad 100644
--- a/index.php
+++ b/index.php
@@ -92,6 +92,7 @@ if (isset($_GET['endcase']))
 }
 
 xhtml_head(T_("queXS"), true, array("css/index.css","css/tabber.css","include/jquery-ui/css/smoothness/jquery-ui-1.8.2.custom.css") , array("js/popup.js","js/tabber.js","include/jquery-ui/js/jquery-1.4.2.min.js","include/jquery-ui/js/jquery-ui-1.8.2.custom.min.js"));
+
 ?>
 
 <div id="casefunctions">
@@ -103,61 +104,73 @@ xhtml_head(T_("queXS"), true, array("css/index.css","css/tabber.css","include/jq
 </div>
 
 <div id="content">
-<object class="embeddedobject" id="main-content" data="<? get_case_id($operator_id,true); get_call_attempt($operator_id,true); if (!is_respondent_selection($operator_id)) print(get_limesurvey_url($operator_id)); else print get_respondentselection_url($operator_id); ?>" standby="Loading questionnaire..." type="application/xhtml+xml"><p>Error, try with Firefox</p></object>
+<? 
+
+get_case_id($operator_id,true);
+get_call_attempt($operator_id,true);
+
+if (!is_respondent_selection($operator_id))
+	$data = get_limesurvey_url($operator_id);
+else 
+	$data = get_respondentselection_url($operator_id);
+
+xhtml_object($data,"main-content"); 
+
+?>
 </div>
 
 <div id="respondent">
-<object class="embeddedobject" id="main-respondent" data="respondent.php" standby="Loading panel..." type="application/xhtml+xml"><p>Error, try with Firefox</p></object>
+<?xhtml_object("respondent.php","main-respondent");?>
 </div>
 
 <div id="qstatus">
-<object class="embeddedobject" id="main-qstatus" data="status.php" standby="Loading panel..." type="application/xhtml+xml"><p>Error, try with Firefox</p></object>
+<?xhtml_object("status.php","main-qstatus");?>
 </div>
 
 
 <div id="calllist">
 
 
-<div class="tabber">
+<div class="tabber" id="tab-main">
 
      <div class="tabbertab">
 	  <h2><? echo T_("Notes"); ?></h2>
-	<object class="embeddedobject" id="main-casenotes" data="casenote.php" standby="Loading panel..." type="application/xhtml+xml"><p>Error, try with Firefox</p></object>     
+	  <div id="div-casenotes" class="tabberdiv"><?xhtml_object("casenote.php","main-casenotes");?></div>
    </div>
 
 
      <div class="tabbertab">
 	  <h2><? echo T_("Call history"); ?></h2>
-	  <object class="embeddedobject" id="main-calllist" data="calllist.php" standby="Loading panel..." type="application/xhtml+xml"><p>Error, try with Firefox</p></object>
+	  <div id="div-calllist" class="tabberdiv"><?xhtml_object("calllist.php","main-calllist");?></div>
      </div>
 
 
-     <div class="tabbertab">
+     <div class="tabbertab" id="tab-shifts">
 	  <h2><? echo T_("Shifts"); ?></h2>
-	  <object class="embeddedobject" id="main-shifts" data="shifts.php" standby="Loading panel..." type="application/xhtml+xml"><p>Error, try with Firefox</p></object>
+	  <div id="div-shifts" class="tabberdiv"><?xhtml_object("shifts.php","main-shifts");?></div>
      </div>
 
 
      <div class="tabbertab">
 	  <h2><? echo T_("Appointments"); ?></h2>
-	  <object class="embeddedobject" id="main-appointmentlist" data="appointmentlist.php" standby="Loading panel..." type="application/xhtml+xml"><p>Error, try with Firefox</p></object>
+	  <div id="div-appointmentlist" class="tabberdiv"><?xhtml_object("appointmentlist.php","main-appointmentlist");?></div>
      </div>
 
 
      <div class="tabbertab">
 	  <h2><? echo T_("Performance"); ?></h2>
-	  <object class="embeddedobject" id="main-performance" data="performance.php" standby="Loading panel..." type="application/xhtml+xml"><p>Error, try with Firefox</p></object>
+	  <div id="div-performance" class="tabberdiv"><?xhtml_object("performance.php","main-performance");?></div>
      </div>
 
      <div class="tabbertab">
 	  <h2><? echo T_("Work history"); ?></h2>
-	  <object class="embeddedobject" id="main-callhistory" data="callhistory.php" standby="Loading panel..." type="application/xhtml+xml"><p>Error, try with Firefox</p></object>
+	  <div id="div-callhistory" class="tabberdiv"><?xhtml_object("callhistory.php","main-callhistory");?></div>
      </div>
 
 
      <div class="tabbertab">
 	  <h2><? echo T_("Info"); ?></h2>
-	  <object class="embeddedobject" id="main-info" data="info.php" standby="Loading panel..." type="application/xhtml+xml"><p>Error, try with Firefox</p></object>
+	  <div id="div-info" class="tabberdiv"><?xhtml_object("info.php","main-info");?></div>
      </div>
 
 
diff --git a/js/tabber.js b/js/tabber.js
index 4fea3145..8e229379 100644
--- a/js/tabber.js
+++ b/js/tabber.js
@@ -30,6 +30,19 @@
   SOFTWARE.
   ==================================================*/
 
+var tabberOptions = {  'onLoad': function(argsObj) {
+	if (jQuery.support.boxModel == false)
+	{
+		var w = $("#tab-main").width();
+		var h = $("#casefunctions").height();
+
+		$(".tabberdiv").css("width",w);
+		$(".tabberdiv").css("height",h);
+	}
+    }
+};
+
+
 function tabberObj(argsObj)
 {
   var arg; /* name of an argument to override */
diff --git a/js/window_ie6.js b/js/window_ie6.js
new file mode 100644
index 00000000..04b17070
--- /dev/null
+++ b/js/window_ie6.js
@@ -0,0 +1,37 @@
+function LinkUp(element)
+{
+	var number = document.getElementById(element).selectedIndex;
+	location.href = document.getElementById(element).options[number].value;
+}
+
+function openParent(get)
+{
+	parent.location.href = 'index.php?' + get;
+}
+
+
+function openParentNote(get)
+{
+	parent.location.href = 'index.php?note=' + document.getElementById('note').value + '&' + get;
+}
+
+function openParentObject(oid,get)
+{
+	var a = parent.document.getElementById(oid);
+	if (a)
+	{
+		a.src = get;
+	}
+
+}
+
+function toggleRec(text,link,classes)
+{
+	var a = parent.document.getElementById('reclink');
+	if (a)
+	{
+		a.innerHTML = text;
+		a.href = "javascript:poptastic('" + link + "');";
+		a.className = classes;
+	}
+}