diff --git a/locale/quexs.pot b/locale/quexs.pot
index 324be679..ef94caa7 100644
--- a/locale/quexs.pot
+++ b/locale/quexs.pot
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: queXS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-09 12:09+1100\n"
+"POT-Creation-Date: 2015-02-09 12:43+1100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Adam Zammit <adam.zammit@acspri.org.au>\n"
 "Language-Team: \n"
@@ -246,7 +246,7 @@ msgstr ""
 
 #: functions/functions.voip.php:449 selectextension.php:108 status.php:99
 #: admin/operatorlist.php:167 admin/operatorlist.php:293
-#: admin/exten_tab.php:155 admin/extensionstatus.php:200
+#: admin/extensionstatus.php:200
 msgid "Extension"
 msgstr ""
 
@@ -441,7 +441,7 @@ msgstr ""
 msgid "Referrals not available for this questionnaire"
 msgstr ""
 
-#: performance.php:61 admin/index_3.php:382 admin/index.php:86 index.php:277
+#: performance.php:61 admin/index.php:86 index.php:277
 #: index_interface2.php:366
 msgid "Performance"
 msgstr ""
@@ -456,7 +456,7 @@ msgstr ""
 #: admin/operatorlist.php:293 admin/supervisor.php:320
 #: admin/supervisor.php:361 admin/operatorperformance.php:81
 #: admin/operatorperformance.php:104 admin/shiftreport.php:104
-#: admin/exten_tab.php:155 admin/extensionstatus.php:200
+#: admin/extensionstatus.php:200
 msgid "Operator"
 msgstr ""
 
@@ -482,12 +482,11 @@ msgstr ""
 msgid "Add note"
 msgstr ""
 
-#: casenote.php:69 admin/index_3.php:88 admin/samplelist.php:128
-#: admin/samplelist.php:180 admin/samplelist.php:217
-#: admin/questionnairelist.php:329 admin/questionnairelist.php:383
-#: admin/availability.php:109 admin/operatorlist.php:145
-#: admin/assignsample.php:141 admin/extensionstatus.php:143 respondent.php:96
-#: contactdetails.php:92
+#: casenote.php:69 admin/samplelist.php:128 admin/samplelist.php:180
+#: admin/samplelist.php:217 admin/questionnairelist.php:329
+#: admin/questionnairelist.php:383 admin/availability.php:109
+#: admin/operatorlist.php:145 admin/assignsample.php:141
+#: admin/extensionstatus.php:143 respondent.php:96 contactdetails.php:92
 msgid "Go back"
 msgstr ""
 
@@ -652,8 +651,8 @@ msgstr ""
 #: include/limesurvey/admin/exportresults.php:644
 #: include/limesurvey/admin/exportresults.php:966 callhistory.php:83
 #: admin/callhistory.php:96 admin/callhistory.php:111
-#: admin/casesbyoutcome.php:87 admin/exten_tab.php:155
-#: admin/extensionstatus.php:200 admin/displayappointments.php:243
+#: admin/casesbyoutcome.php:87 admin/extensionstatus.php:200
+#: admin/displayappointments.php:243
 msgid "Case ID"
 msgstr ""
 
@@ -831,8 +830,8 @@ msgid ""
 "number)"
 msgstr ""
 
-#: supervisorchat.php:56 admin/index_3.php:436 admin/supervisorchat.php:61
-#: admin/index.php:106 index.php:301
+#: supervisorchat.php:56 admin/supervisorchat.php:61 admin/index.php:106
+#: index.php:301
 msgid "Supervisor chat"
 msgstr ""
 
@@ -982,11 +981,10 @@ msgstr ""
 msgid "Current shifts available:"
 msgstr ""
 
-#: nocaseavailable.php:138 admin/index_3.php:309
-#: admin/questionnairelist.php:397 admin/callhistory.php:96
-#: admin/callhistory.php:111 admin/assignsample.php:138
-#: admin/supervisor.php:297 admin/casestatus.php:208
-#: admin/displayappointments.php:243 shifts.php:103
+#: nocaseavailable.php:138 admin/questionnairelist.php:397
+#: admin/callhistory.php:96 admin/callhistory.php:111
+#: admin/assignsample.php:138 admin/supervisor.php:297
+#: admin/casestatus.php:208 admin/displayappointments.php:243 shifts.php:103
 msgid "Questionnaire"
 msgstr ""
 
@@ -1126,219 +1124,6 @@ msgstr ""
 msgid "Select call attempt time slot:"
 msgstr ""
 
-#: admin/index_3.php:27 admin/index.php:46
-msgid "Administrative Tools"
-msgstr ""
-
-#: admin/index_3.php:72
-msgid "MENU toggle"
-msgstr ""
-
-#: admin/index_3.php:82
-msgid "Home"
-msgstr ""
-
-#: admin/index_3.php:92
-msgid "Current page"
-msgstr ""
-
-#: admin/index_3.php:308
-msgid "Dashboard"
-msgstr ""
-
-#: admin/index_3.php:311 admin/index.php:51 admin/new.php:153
-msgid "Create an instrument in Limesurvey"
-msgstr ""
-
-#: admin/index_3.php:312 admin/index.php:52
-msgid "Create a new questionnaire"
-msgstr ""
-
-#: admin/index_3.php:313 admin/index.php:53
-msgid "Questionnaire management"
-msgstr ""
-
-#: admin/index_3.php:314 admin/index.php:54
-msgid "Administer instruments with Limesurvey"
-msgstr ""
-
-#: admin/index_3.php:317
-msgid "Sample Lists"
-msgstr ""
-
-#: admin/index_3.php:319 admin/index.php:57
-msgid "Import a sample file (in CSV form)"
-msgstr ""
-
-#: admin/index_3.php:320 admin/index.php:58
-msgid "Sample management"
-msgstr ""
-
-#: admin/index_3.php:321 admin/index.php:59
-msgid "Assign samples to questionnaires"
-msgstr ""
-
-#: admin/index_3.php:322 admin/index.php:60
-msgid "Set values in questionnaire to pre fill"
-msgstr ""
-
-#: admin/index_3.php:325
-msgid "Quotas"
-msgstr ""
-
-#: admin/index_3.php:327 admin/index.php:62 admin/index.php:63
-#: admin/quota.php:109
-msgid "Quota management"
-msgstr ""
-
-#: admin/index_3.php:328 admin/index.php:64 admin/quotarow.php:126
-msgid "Quota row management"
-msgstr ""
-
-#: admin/index_3.php:331
-msgid "Operators"
-msgstr ""
-
-#: admin/index_3.php:334 admin/index.php:67
-msgid "Add operators to the system"
-msgstr ""
-
-#: admin/index_3.php:337 admin/index_3.php:456 admin/index.php:66
-#: admin/index.php:68 admin/index.php:113
-msgid "Operator management"
-msgstr ""
-
-#: admin/index_3.php:340 admin/index_3.php:459 admin/index.php:114
-msgid "Extension status"
-msgstr ""
-
-#: admin/index_3.php:343 admin/index.php:69
-#: admin/operatorquestionnaire.php:155 admin/operatorquestionnaire.php:276
-msgid "Assign operators to questionnaires"
-msgstr ""
-
-#: admin/index_3.php:346 admin/index.php:70 admin/operatorskill.php:272
-msgid "Modify operator skills"
-msgstr ""
-
-#: admin/index_3.php:350 admin/index.php:72
-msgid "Availability and shift management"
-msgstr ""
-
-#: admin/index_3.php:353
-msgid "Manage availablity groups"
-msgstr ""
-
-#: admin/index_3.php:356 admin/index.php:74
-msgid "Assign availabilities to questionnaires"
-msgstr ""
-
-#: admin/index_3.php:359 admin/index.php:77
-msgid "Shift management (add/remove)"
-msgstr ""
-
-#: admin/index_3.php:363 admin/index.php:79
-msgid "Questionnaire progress"
-msgstr ""
-
-#: admin/index_3.php:366 admin/index.php:80
-msgid "Display all future appointments"
-msgstr ""
-
-#: admin/index_3.php:369 admin/index.php:81
-msgid "Sample call attempts report"
-msgstr ""
-
-#: admin/index_3.php:372 admin/quotareport.php:109 admin/index.php:82
-msgid "Quota report"
-msgstr ""
-
-#: admin/index_3.php:375 admin/index.php:83
-msgid "Questionnaire outcomes"
-msgstr ""
-
-#: admin/index_3.php:378 admin/index.php:84 admin/dataoutput.php:186
-msgid "Data output"
-msgstr ""
-
-#: admin/index_3.php:385 admin/outcomes.php:297 admin/index.php:87
-msgid "Operator performance"
-msgstr ""
-
-#: admin/index_3.php:389 admin/index.php:89
-msgid "Client management"
-msgstr ""
-
-#: admin/index_3.php:392 admin/index.php:90
-msgid "Add clients to the system"
-msgstr ""
-
-#: admin/index_3.php:395 admin/clientquestionnaire.php:150
-#: admin/clientquestionnaire.php:271 admin/index.php:91
-msgid "Assign clients to questionnaires"
-msgstr ""
-
-#: admin/index_3.php:399 admin/index.php:93 admin/supervisor.php:131
-msgid "Supervisor functions"
-msgstr ""
-
-#: admin/index_3.php:402 admin/index.php:94
-msgid "Assign outcomes to cases"
-msgstr ""
-
-#: admin/index_3.php:405 admin/index.php:95
-msgid "Search the sample"
-msgstr ""
-
-#: admin/index_3.php:408 admin/index.php:96 index.php:250
-#: index_interface2.php:339
-msgid "Call history"
-msgstr ""
-
-#: admin/index_3.php:411 admin/index.php:97 admin/shiftreport.php:61
-msgid "Shift reports"
-msgstr ""
-
-#: admin/index_3.php:414 admin/index.php:98 admin/casestatus.php:198
-msgid "Case status and assignment"
-msgstr ""
-
-#: admin/index_3.php:417 admin/bulkappointment.php:250 admin/index.php:99
-msgid "Bulk appointment generator"
-msgstr ""
-
-#: admin/index_3.php:421 admin/index.php:101
-msgid "System settings"
-msgstr ""
-
-#: admin/index_3.php:424 admin/index.php:102
-msgid "Set default timezone list"
-msgstr ""
-
-#: admin/index_3.php:427 admin/index.php:103
-msgid "Set default shift times"
-msgstr ""
-
-#: admin/index_3.php:430 admin/index.php:104
-msgid "Set call restriction times"
-msgstr ""
-
-#: admin/index_3.php:433 admin/centreinfo.php:63 admin/index.php:105
-msgid "Set centre information"
-msgstr ""
-
-#: admin/index_3.php:439 admin/index.php:107
-msgid "Start and monitor system wide case sorting"
-msgstr ""
-
-#: admin/index_3.php:450 admin/index.php:111
-msgid "VoIP"
-msgstr ""
-
-#: admin/index_3.php:453 admin/index.php:112
-msgid "Start and monitor VoIP"
-msgstr ""
-
 #: admin/samplelist.php:117 admin/samplelist.php:127 admin/samplelist.php:134
 #: admin/samplelist.php:279
 msgid "Rename"
@@ -1481,38 +1266,6 @@ msgstr ""
 msgid "Failed to complete sort"
 msgstr ""
 
-#: admin/login.php:11
-msgid "Login to   "
-msgstr ""
-
-#: admin/login.php:31 admin/login.php:61
-msgid "LOG IN"
-msgstr ""
-
-#: admin/login.php:31
-msgid "to continue..."
-msgstr ""
-
-#: admin/login.php:39
-msgid "Your Photo "
-msgstr ""
-
-#: admin/login.php:49 admin/operatorlist.php:158 admin/operatorlist.php:293
-msgid "Username"
-msgstr ""
-
-#: admin/login.php:57
-msgid "Password"
-msgstr ""
-
-#: admin/login.php:69
-msgid "Don't have an account?"
-msgstr ""
-
-#: admin/login.php:69
-msgid "Register Here  "
-msgstr ""
-
 #: admin/systemsort.php:75 admin/systemsort.php:98 admin/systemsort.php:99
 msgid "Monitor system wide case sorting"
 msgstr ""
@@ -1631,6 +1384,10 @@ msgstr ""
 msgid "Add user"
 msgstr ""
 
+#: admin/quotareport.php:109 admin/index.php:82
+msgid "Quota report"
+msgstr ""
+
 #: admin/quotareport.php:118 admin/samplesearch.php:84
 #: admin/questionnairecatimeslotssample.php:107 admin/quota.php:123
 #: admin/quotarow.php:140
@@ -1816,6 +1573,10 @@ msgstr ""
 msgid "Shift"
 msgstr ""
 
+#: admin/outcomes.php:297 admin/index.php:87
+msgid "Operator performance"
+msgstr ""
+
 #: admin/samplesearch.php:83
 msgid "Search sample"
 msgstr ""
@@ -1891,6 +1652,10 @@ msgstr ""
 msgid "Import: Select file to upload"
 msgstr ""
 
+#: admin/bulkappointment.php:250 admin/index.php:99
+msgid "Bulk appointment generator"
+msgstr ""
+
 #: admin/bulkappointment.php:251
 msgid ""
 "Provide a headered CSV file containing at least 3 columns - caseid, "
@@ -2212,6 +1977,11 @@ msgstr ""
 msgid "Delete this time slot group"
 msgstr ""
 
+#: admin/clientquestionnaire.php:150 admin/clientquestionnaire.php:271
+#: admin/index.php:91
+msgid "Assign clients to questionnaires"
+msgstr ""
+
 #: admin/questionnaireavailability.php:93
 msgid "Assign availability group to questionnaire"
 msgstr ""
@@ -2262,6 +2032,10 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
+#: admin/operatorlist.php:158 admin/operatorlist.php:293
+msgid "Username"
+msgstr ""
+
 #: admin/operatorlist.php:162
 msgid "Update password (leave blank to keep existing password)"
 msgstr ""
@@ -2313,6 +2087,10 @@ msgstr ""
 msgid "*nix VoIP"
 msgstr ""
 
+#: admin/centreinfo.php:63 admin/index.php:105
+msgid "Set centre information"
+msgstr ""
+
 #: admin/centreinfo.php:67
 msgid "Set centre information: "
 msgstr ""
@@ -2357,18 +2135,175 @@ msgstr ""
 msgid "Add sample"
 msgstr ""
 
+#: admin/index.php:46
+msgid "Administrative Tools"
+msgstr ""
+
 #: admin/index.php:50
 msgid "Questionnaire creation and management"
 msgstr ""
 
+#: admin/index.php:51 admin/new.php:153
+msgid "Create an instrument in Limesurvey"
+msgstr ""
+
+#: admin/index.php:52
+msgid "Create a new questionnaire"
+msgstr ""
+
+#: admin/index.php:53
+msgid "Questionnaire management"
+msgstr ""
+
+#: admin/index.php:54
+msgid "Administer instruments with Limesurvey"
+msgstr ""
+
 #: admin/index.php:56
 msgid "Sample/List management"
 msgstr ""
 
+#: admin/index.php:57
+msgid "Import a sample file (in CSV form)"
+msgstr ""
+
+#: admin/index.php:58
+msgid "Sample management"
+msgstr ""
+
+#: admin/index.php:59
+msgid "Assign samples to questionnaires"
+msgstr ""
+
+#: admin/index.php:60
+msgid "Set values in questionnaire to pre fill"
+msgstr ""
+
+#: admin/index.php:62 admin/index.php:63 admin/quota.php:109
+msgid "Quota management"
+msgstr ""
+
+#: admin/index.php:64 admin/quotarow.php:126
+msgid "Quota row management"
+msgstr ""
+
+#: admin/index.php:66 admin/index.php:68 admin/index.php:113
+msgid "Operator management"
+msgstr ""
+
+#: admin/index.php:67
+msgid "Add operators to the system"
+msgstr ""
+
+#: admin/index.php:69 admin/operatorquestionnaire.php:155
+#: admin/operatorquestionnaire.php:276
+msgid "Assign operators to questionnaires"
+msgstr ""
+
+#: admin/index.php:70 admin/operatorskill.php:272
+msgid "Modify operator skills"
+msgstr ""
+
+#: admin/index.php:72
+msgid "Availability and shift management"
+msgstr ""
+
 #: admin/index.php:73
 msgid "Manage time slots"
 msgstr ""
 
+#: admin/index.php:74
+msgid "Assign availabilities to questionnaires"
+msgstr ""
+
+#: admin/index.php:77
+msgid "Shift management (add/remove)"
+msgstr ""
+
+#: admin/index.php:79
+msgid "Questionnaire progress"
+msgstr ""
+
+#: admin/index.php:80
+msgid "Display all future appointments"
+msgstr ""
+
+#: admin/index.php:81
+msgid "Sample call attempts report"
+msgstr ""
+
+#: admin/index.php:83
+msgid "Questionnaire outcomes"
+msgstr ""
+
+#: admin/index.php:84 admin/dataoutput.php:186
+msgid "Data output"
+msgstr ""
+
+#: admin/index.php:89
+msgid "Client management"
+msgstr ""
+
+#: admin/index.php:90
+msgid "Add clients to the system"
+msgstr ""
+
+#: admin/index.php:93 admin/supervisor.php:131
+msgid "Supervisor functions"
+msgstr ""
+
+#: admin/index.php:94
+msgid "Assign outcomes to cases"
+msgstr ""
+
+#: admin/index.php:95
+msgid "Search the sample"
+msgstr ""
+
+#: admin/index.php:96 index.php:250 index_interface2.php:339
+msgid "Call history"
+msgstr ""
+
+#: admin/index.php:97 admin/shiftreport.php:61
+msgid "Shift reports"
+msgstr ""
+
+#: admin/index.php:98 admin/casestatus.php:198
+msgid "Case status and assignment"
+msgstr ""
+
+#: admin/index.php:101
+msgid "System settings"
+msgstr ""
+
+#: admin/index.php:102
+msgid "Set default timezone list"
+msgstr ""
+
+#: admin/index.php:103
+msgid "Set default shift times"
+msgstr ""
+
+#: admin/index.php:104
+msgid "Set call restriction times"
+msgstr ""
+
+#: admin/index.php:107
+msgid "Start and monitor system wide case sorting"
+msgstr ""
+
+#: admin/index.php:111
+msgid "VoIP"
+msgstr ""
+
+#: admin/index.php:112
+msgid "Start and monitor VoIP"
+msgstr ""
+
+#: admin/index.php:114
+msgid "Extension status"
+msgstr ""
+
 #: admin/samplecallattempts.php:107
 msgid "Number of cases"
 msgstr ""
@@ -2870,30 +2805,6 @@ msgstr ""
 msgid "Modify report"
 msgstr ""
 
-#: admin/exten_tab.php:74 admin/extensionstatus.php:101
-msgid "Failed to add extension. There already may be an extension of this name"
-msgstr ""
-
-#: admin/exten_tab.php:155 admin/extensionstatus.php:200
-msgid "Assignment"
-msgstr ""
-
-#: admin/exten_tab.php:155 admin/extensionstatus.php:200
-msgid "VoIP Status"
-msgstr ""
-
-#: admin/exten_tab.php:155 admin/extensionstatus.php:200
-msgid "Call state"
-msgstr ""
-
-#: admin/exten_tab.php:155 admin/extensionstatus.php:200
-msgid "Time on call"
-msgstr ""
-
-#: admin/exten_tab.php:158 admin/extensionstatus.php:203
-msgid "No extensions"
-msgstr ""
-
 #: admin/casestatus.php:112
 msgid "Case available in x minutes"
 msgstr ""
@@ -2932,6 +2843,10 @@ msgstr ""
 msgid "Save changes to shifts"
 msgstr ""
 
+#: admin/extensionstatus.php:101
+msgid "Failed to add extension. There already may be an extension of this name"
+msgstr ""
+
 #: admin/extensionstatus.php:133
 msgid "Display extension status"
 msgstr ""
@@ -2956,6 +2871,26 @@ msgstr ""
 msgid "Unassign the operator from this extension to be able to delete it"
 msgstr ""
 
+#: admin/extensionstatus.php:200
+msgid "Assignment"
+msgstr ""
+
+#: admin/extensionstatus.php:200
+msgid "VoIP Status"
+msgstr ""
+
+#: admin/extensionstatus.php:200
+msgid "Call state"
+msgstr ""
+
+#: admin/extensionstatus.php:200
+msgid "Time on call"
+msgstr ""
+
+#: admin/extensionstatus.php:203
+msgid "No extensions"
+msgstr ""
+
 #: admin/extensionstatus.php:205
 msgid "Add an extension"
 msgstr ""