Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/Application.as
===================================================================
diff -u -rc0310ef0d1c427e03d4c389bd039adea2361c0c1 -r9a0394f988041ead8e0e4399253c14858e56b8ad
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/Application.as	(.../Application.as)	(revision c0310ef0d1c427e03d4c389bd039adea2361c0c1)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/Application.as	(.../Application.as)	(revision 9a0394f988041ead8e0e4399253c14858e56b8ad)
@@ -26,7 +26,7 @@
 	public static var C_DEFAULT = "default";
 	
     private static var TOOLBAR_X:Number = 10;
-    private static var TOOLBAR_Y:Number = 17;
+    private static var TOOLBAR_Y:Number = 35;
 
     private static var TOOLKIT_X:Number = 0;
     private static var TOOLKIT_Y:Number = 74;
Index: lams_common/src/flash/org/lamsfoundation/lams/common/PreferencesDialog.as
===================================================================
diff -u -r98fd51449c072a1f4da231734b5bc84b582339ee -r9a0394f988041ead8e0e4399253c14858e56b8ad
--- lams_common/src/flash/org/lamsfoundation/lams/common/PreferencesDialog.as	(.../PreferencesDialog.as)	(revision 98fd51449c072a1f4da231734b5bc84b582339ee)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/PreferencesDialog.as	(.../PreferencesDialog.as)	(revision 9a0394f988041ead8e0e4399253c14858e56b8ad)
@@ -86,8 +86,8 @@
         cancel_btn.label = Dictionary.getValue('prefs_dlg_cancel');
         
         //Set the labels
-        lang_lbl.text = Dictionary.getValue('prefs_dlg_theme_lbl');
-        theme_lbl.text = Dictionary.getValue('prefs_dlg_lng_lbl');
+        lang_lbl.text = Dictionary.getValue('prefs_dlg_lng_lbl');
+        theme_lbl.text = Dictionary.getValue('prefs_dlg_theme_lbl');
         
         //get focus manager + set focus to OK button, focus manager is available to all components through getFocusManager
         fm = _container.getFocusManager();