diff --git a/source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp b/source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp
index 8afd10efe8..6034eff29f 100644
--- a/source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp
+++ b/source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp
@@ -65,11 +65,12 @@ ActorEditor::ActorEditor(wxWindow* parent)
 
 	materialsPanel->SetSizer(materialsSizer);
 
-//	m_Material = new wxTextCtrl(materialsPanel, wxID_ANY, _T(""));
-	wxArrayString materials;
-	AtObj list (Datafile::ReadList("materials"));
-	for (AtIter it = list["material"]; it.defined(); ++it)
-		materials.Add(it);
+	// Get the list of XML materials
+	wxArrayString materials = Datafile::EnumerateDataFiles(_T("mods/official/art/materials/"), _T("*.xml"));
+	// Extract the filenames and discard the path
+	for (size_t i = 0; i < materials.Count(); ++i)
+		materials[i] = wxFileName(materials[i]).GetFullName();
+
 	m_Material = new wxComboBox(materialsPanel, wxID_ANY, _T(""), wxDefaultPosition, wxDefaultSize, materials);
 	materialsSizer->Add(m_Material, wxSizerFlags().Border(wxALL, 2));
 
@@ -317,8 +318,8 @@ void ActorEditor::OnCreateEntity(wxCommandEvent& WXUNUSED(event))
 	wxString entityName = currentFilename.GetName();
 
 	// Work out where the entities are stored
-	wxFileName entityPath (_T("../data/mods/official/entities/"));
-	entityPath.MakeAbsolute(Datafile::GetSystemDirectory());
+	wxFileName entityPath (_T("mods/official/entities/"));
+	entityPath.MakeAbsolute(Datafile::GetDataDirectory());
 
 	// Make sure the user knows what's going on
 	static bool instructed = false; // only tell them once per session
@@ -348,8 +349,8 @@ void ActorEditor::OnCreateEntity(wxCommandEvent& WXUNUSED(event))
 		return; // cancelled by user
 
 	// Get this actor's filename, relative to actors/
-	wxFileName actorPath (_T("../data/mods/official/art/actors/"));
-	actorPath.MakeAbsolute(Datafile::GetSystemDirectory());
+	wxFileName actorPath (_T("mods/official/art/actors/"));
+	actorPath.MakeAbsolute(Datafile::GetDataDirectory());
 	wxFileName actorFilename (currentFilename);
 	actorFilename.MakeRelativeTo(actorPath.GetFullPath());
 
@@ -375,3 +376,10 @@ void ActorEditor::OnCreateEntity(wxCommandEvent& WXUNUSED(event))
 		return;
 	}
 }
+
+wxString ActorEditor::GetDefaultOpenDirectory()
+{
+	wxFileName dir (_T("mods/official/art/actors/"), wxPATH_UNIX);
+	dir.MakeAbsolute(Datafile::GetDataDirectory());
+	return dir.GetPath();
+}
diff --git a/source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.h b/source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.h
index 478d9dee90..3ac16c8da8 100644
--- a/source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.h
+++ b/source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.h
@@ -17,6 +17,8 @@ protected:
 	AtObj ExportData();
 	void ImportData(AtObj& in);
 
+	virtual wxString GetDefaultOpenDirectory();
+
 private:
 	ActorEditorListCtrl* m_ActorEditorListCtrl;
 
diff --git a/source/tools/atlas/AtlasUI/ActorEditor/AnimListEditor.cpp b/source/tools/atlas/AtlasUI/ActorEditor/AnimListEditor.cpp
index 3cfba10d91..003dac448c 100644
--- a/source/tools/atlas/AtlasUI/ActorEditor/AnimListEditor.cpp
+++ b/source/tools/atlas/AtlasUI/ActorEditor/AnimListEditor.cpp
@@ -10,7 +10,7 @@
 IMPLEMENT_DYNAMIC_CLASS(AnimListEditor, AtlasDialog);
 
 AnimListEditor::AnimListEditor()
-	: AtlasDialog(NULL, _("Animation editor"))
+	: AtlasDialog(NULL, _("Animation editor"), wxSize(480, 280))
 {
 	m_MainListBox = new AnimListEditorListCtrl(m_MainPanel);
 
@@ -50,8 +50,8 @@ AnimListEditorListCtrl::AnimListEditorListCtrl(wxWindow* parent)
 	AddColumnType(_("Anim name"), 100, "@name",  new FieldEditCtrl_List("animations"));
 	AddColumnType(_("File"),	  200, "@file",  new FieldEditCtrl_File(_T("art/animation/"), _("Animation files (*.psa)|*.psa|All files (*.*)|*.*")));
 	AddColumnType(_("Speed"),	  50,  "@speed", new FieldEditCtrl_Text());
-	AddColumnType(_("Load"),	  30,  "@load",  new FieldEditCtrl_Text());
-	AddColumnType(_("Event"),	  30,  "@event", new FieldEditCtrl_Text());
+	AddColumnType(_("Load"),	  40,  "@load",  new FieldEditCtrl_Text());
+	AddColumnType(_("Event"),	  40,  "@event", new FieldEditCtrl_Text());
 }
 
 void AnimListEditorListCtrl::DoImport(AtObj& in)
diff --git a/source/tools/atlas/AtlasUI/ActorEditor/PropListEditor.cpp b/source/tools/atlas/AtlasUI/ActorEditor/PropListEditor.cpp
index ffe83808a1..b919b5616c 100644
--- a/source/tools/atlas/AtlasUI/ActorEditor/PropListEditor.cpp
+++ b/source/tools/atlas/AtlasUI/ActorEditor/PropListEditor.cpp
@@ -10,7 +10,7 @@
 IMPLEMENT_DYNAMIC_CLASS(PropListEditor, AtlasDialog);
 
 PropListEditor::PropListEditor()
-	: AtlasDialog(NULL, _("Prop editor"))
+	: AtlasDialog(NULL, _("Prop editor"), wxSize(400, 280))
 {
 	m_MainListBox = new PropListEditorListCtrl(m_MainPanel);
 
diff --git a/source/tools/atlas/AtlasUI/AtlasUI.vcproj b/source/tools/atlas/AtlasUI/AtlasUI.vcproj
index 26542dc7b3..0a0d707a8b 100644
--- a/source/tools/atlas/AtlasUI/AtlasUI.vcproj
+++ b/source/tools/atlas/AtlasUI/AtlasUI.vcproj
@@ -66,7 +66,8 @@
 			OutputDirectory="..\..\..\..\binaries\system"
 			IntermediateDirectory="..\..\..\..\build\workspaces\atlas\Release\ui"
 			ConfigurationType="2"
-			CharacterSet="1">
+			CharacterSet="1"
+			WholeProgramOptimization="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="1"
diff --git a/source/tools/atlas/AtlasUI/ColourTester/ColourTesterFileCtrl.cpp b/source/tools/atlas/AtlasUI/ColourTester/ColourTesterFileCtrl.cpp
index a036430357..7328ad8511 100644
--- a/source/tools/atlas/AtlasUI/ColourTester/ColourTesterFileCtrl.cpp
+++ b/source/tools/atlas/AtlasUI/ColourTester/ColourTesterFileCtrl.cpp
@@ -13,8 +13,8 @@ ColourTesterFileCtrl::ColourTesterFileCtrl(wxWindow* parent, const wxSize& size,
 	: wxVirtualDirTreeCtrl(parent, wxID_ANY, wxDefaultPosition, size),
 	m_ImageCtrl(imgctrl)
 {
-	wxFileName path (_T("../data/mods/official/art/textures/skins/"));
-	path.MakeAbsolute(Datafile::GetSystemDirectory());
+	wxFileName path (_T("mods/official/art/textures/skins/"));
+	path.MakeAbsolute(Datafile::GetDataDirectory());
 	wxASSERT(path.IsOk());
 	SetRootPath(path.GetPath());
 }
diff --git a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/FieldEditCtrl.cpp b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/FieldEditCtrl.cpp
index 797a00c959..dfc1ff5dae 100644
--- a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/FieldEditCtrl.cpp
+++ b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/FieldEditCtrl.cpp
@@ -117,9 +117,9 @@ FieldEditCtrl_File::FieldEditCtrl_File(const wxString& rootDir, const wxString&
 	: m_FileMask(fileMask)
 {
 	// Make the rootDir path absolute (where rootDir is relative to binaries/system):
-	wxFileName path (_T("../data/mods/official/") + rootDir);
+	wxFileName path (_T("mods/official/") + rootDir);
 	wxASSERT(path.IsOk());
-	path.MakeAbsolute(Datafile::GetSystemDirectory());
+	path.MakeAbsolute(Datafile::GetDataDirectory());
 	wxASSERT(path.IsOk());
 	m_RememberedDir = m_RootDir = path.GetPath();
 }
diff --git a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.cpp b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.cpp
index f8f52bfe36..d752cf1a24 100644
--- a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.cpp
+++ b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.cpp
@@ -12,8 +12,8 @@ BEGIN_EVENT_TABLE(AtlasDialog, wxDialog)
 END_EVENT_TABLE()
 
 
-AtlasDialog::AtlasDialog(wxWindow* parent, const wxString& title)
-	: wxDialog(parent, -1, title, wxDefaultPosition, wxDefaultSize,
+AtlasDialog::AtlasDialog(wxWindow* parent, const wxString& title, const wxSize& size)
+	: wxDialog(parent, -1, title, wxDefaultPosition, size,
 			   wxCAPTION | wxRESIZE_BORDER | wxSYSTEM_MENU | wxCLOSE_BOX)
 {
 	// Create generic dialog box, with OK/Cancel buttons, some horizontal
diff --git a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.h b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.h
index b5ab334362..856b46703c 100644
--- a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.h
+++ b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.h
@@ -13,7 +13,7 @@ class AtlasDialog : public wxDialog, public IAtlasSerialiser
 	DECLARE_CLASS(AtlasDialog);
 
 public:
-	AtlasDialog(wxWindow* parent, const wxString& title);
+	AtlasDialog(wxWindow* parent, const wxString& title, const wxSize& size);
 	virtual ~AtlasDialog() {}
 
 private:
diff --git a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.cpp b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.cpp
index 7136afd087..369cc051b5 100644
--- a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.cpp
+++ b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.cpp
@@ -193,7 +193,18 @@ void AtlasWindow::OnNew(wxCommandEvent& WXUNUSED(event))
 
 void AtlasWindow::OnOpen(wxCommandEvent& WXUNUSED(event))
 {
-	wxFileDialog dlg (this, _("Select XML file to open"), _T(""), _T(""), _("XML files (*.xml)|*.xml|All files (*.*)|*.*"), wxOPEN);
+	wxString path, name;
+	if (GetCurrentFilename().IsOk())
+	{
+		path = GetCurrentFilename().GetPath();
+		name = GetCurrentFilename().GetFullName();
+	}
+	else
+	{
+		path = GetDefaultOpenDirectory();
+	}
+
+	wxFileDialog dlg (this, _("Select XML file to open"), path, name, _("XML files (*.xml)|*.xml|All files (*.*)|*.*"), wxOPEN);
 
 	if (dlg.ShowModal() != wxID_OK)
 		return;
@@ -219,7 +230,6 @@ void AtlasWindow::OnMRUFile(wxCommandEvent& event)
 }
 
 
-
 void AtlasWindow::SetCurrentFilename(wxFileName filename)
 {
 	m_CurrentFilename = filename;
diff --git a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.h b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.h
index d6288e8a28..c94d7867c1 100644
--- a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.h
+++ b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.h
@@ -63,6 +63,8 @@ protected:
 	void SetCurrentFilename(wxFileName filename = wxString());
 	wxFileName GetCurrentFilename() { return m_CurrentFilename; }
 
+	virtual wxString GetDefaultOpenDirectory() = 0;
+
 	bool SaveChanges(bool forceSaveAs);
 public:
 	bool OpenFile(wxString filename);
diff --git a/source/tools/atlas/AtlasUI/General/Datafile.cpp b/source/tools/atlas/AtlasUI/General/Datafile.cpp
index ef8b2db003..ebbf7955ec 100644
--- a/source/tools/atlas/AtlasUI/General/Datafile.cpp
+++ b/source/tools/atlas/AtlasUI/General/Datafile.cpp
@@ -3,13 +3,17 @@
 #include "Datafile.h"
 
 #include "wx/filename.h"
+#include "wx/dir.h"
+
+static wxString systemDir;
+static wxString dataDir;
 
 AtObj Datafile::ReadList(const char* section)
 {
-	const wxString relativePath (_T("../data/tools/atlas/lists.xml"));
+	const wxString relativePath (_T("tools/atlas/lists.xml"));
 
 	wxFileName filename (relativePath, wxPATH_UNIX);
-	filename.MakeAbsolute(systemDir);
+	filename.MakeAbsolute(dataDir);
 
 	if (! filename.FileExists())
 	{
@@ -24,7 +28,25 @@ AtObj Datafile::ReadList(const char* section)
 
 void Datafile::SetSystemDirectory(const wxString& dir)
 {
-	systemDir = wxFileName(dir).GetPath();
+	wxFileName sys (dir);
+	systemDir = sys.GetPath();
+
+	wxFileName data (_T("../data/"), wxPATH_UNIX);
+	data.MakeAbsolute(systemDir);
+	dataDir = data.GetPath();
 }
 
-wxString Datafile::systemDir;
\ No newline at end of file
+wxString Datafile::GetDataDirectory()
+{
+	return dataDir;
+}
+
+wxArrayString Datafile::EnumerateDataFiles(const wxString& dir, const wxString& filter)
+{
+	wxFileName d (dir);
+	d.MakeAbsolute(dataDir);
+
+	wxArrayString files;
+	wxDir::GetAllFiles(d.GetPath(), &files, filter, wxDIR_FILES);
+	return files;
+}
diff --git a/source/tools/atlas/AtlasUI/General/Datafile.h b/source/tools/atlas/AtlasUI/General/Datafile.h
index 72fe12d99d..1e05be3ddd 100644
--- a/source/tools/atlas/AtlasUI/General/Datafile.h
+++ b/source/tools/atlas/AtlasUI/General/Datafile.h
@@ -1,18 +1,19 @@
 #include "AtlasObject/AtlasObject.h"
 
-class Datafile
+namespace Datafile
 {
-public:
-
 	// Read configuration data from data/tools/atlas/lists.xml
-	static AtObj ReadList(const char* section);
+	AtObj ReadList(const char* section);
 
 	// Specify the location of .../binaries/system, as an absolute path, or
 	// relative to the current working directory.
-	static void SetSystemDirectory(const wxString& dir);
+	void SetSystemDirectory(const wxString& dir);
 
-	static wxString GetSystemDirectory() { return systemDir; }
+	// Returns the location of .../binaries/data. (TODO (eventually): replace
+	// this with a proper VFS-aware system.)
+	wxString GetDataDirectory();
 
-private:
-	static wxString systemDir;
+	// Returns a list of files matching the given wildcard (* and ?) filter
+	// inside .../binaries/data/<dir>, not recursively.
+	wxArrayString EnumerateDataFiles(const wxString& dir, const wxString& filter);
 };
\ No newline at end of file
diff --git a/source/tools/atlas/AtlasUI/Misc/stdafx.h b/source/tools/atlas/AtlasUI/Misc/stdafx.h
index 6deafe0e78..c2c2763f2b 100644
--- a/source/tools/atlas/AtlasUI/Misc/stdafx.h
+++ b/source/tools/atlas/AtlasUI/Misc/stdafx.h
@@ -18,6 +18,7 @@
 #include "wx/filename.h"
 #include "wx/artprov.h"
 #include "wx/file.h"
+#include "wx/dir.h"
 #include "wx/colordlg.h"
 #include "wx/regex.h"
 #include "wx/image.h"
diff --git a/source/tools/atlas/AtlasUI/TODO.txt b/source/tools/atlas/AtlasUI/TODO.txt
index 46ff035186..00befda7c0 100644
--- a/source/tools/atlas/AtlasUI/TODO.txt
+++ b/source/tools/atlas/AtlasUI/TODO.txt
@@ -35,6 +35,8 @@ General and/or unsorted miscellany:
 
 ===
 
+* Test/fix when running with large fonts, or weird XP styles
+
 * Better copy and paste (e.g. between multiple instances of the program,
   and paste XML into other text-editing programs