Index: src/core-utils/gnc-gconf-utils.h
===================================================================
--- src/core-utils/gnc-gconf-utils.h	(revision 21662)
+++ src/core-utils/gnc-gconf-utils.h	(working copy)
@@ -880,7 +880,7 @@
 
 /** Check gconf to see if the schema for one of the gnucash keys can
  *  be found.  This function is called to determine whether or not to
- *  launch a druid to help the user properly set up GConf for Gnucash.
+ *  launch an assistant to help the user properly set up GConf for Gnucash.
  *
  *  @return This function returns TRUE if it was able to find a
  *  schema.
Index: src/import-export/qif-import/assistant-qif-import.c
===================================================================
--- src/import-export/qif-import/assistant-qif-import.c	(revision 21662)
+++ src/import-export/qif-import/assistant-qif-import.c	(working copy)
@@ -38,6 +38,7 @@
 #include "dialog-commodity.h"
 #include "dialog-progress.h"
 #include "dialog-utils.h"
+#include "dialog-file-access.h" 
 #include "assistant-qif-import.h"
 #include "assistant-utils.h"
 #include "gnc-component-manager.h"
@@ -155,6 +156,7 @@
     gboolean  ask_date_format;
     gboolean  busy;
     gboolean  load_stop;
+    gboolean  acct_tree_found;
 
     SCM       imported_files;
     SCM       selected_file;
@@ -1335,6 +1337,10 @@
 {
     QIFImportWindow  *wind = user_data;
 
+    /* If We did not have an account tree, lets save it */
+    if(!wind->acct_tree_found)
+        gnc_ui_file_access_for_save_as();
+
     gnc_close_gui_component_by_data( ASSISTANT_QIF_IMPORT_CM_CLASS, wind );
 }
 
@@ -3219,6 +3225,7 @@
     gnc_main_window_foreach_page(gnc_ui_qif_import_check_acct_tree,
                                  &acct_tree_found);
 
+    wind->acct_tree_found = acct_tree_found;
     if (!acct_tree_found)
     {
         page = gnc_plugin_page_account_tree_new();
@@ -3581,6 +3588,9 @@
     /* Get all interesting builder-defined widgets. */
     get_assistant_widgets(qif_win, builder);
 
+    /* Make this window stay on top */
+    gtk_window_set_keep_above (GTK_WINDOW(qif_win->window), TRUE);
+
     /* Build the details of all GtkTreeView widgets. */
     build_views(qif_win);
 
Index: src/gnome-utils/assistant-utils.h
===================================================================
--- src/gnome-utils/assistant-utils.h	(revision 21662)
+++ src/gnome-utils/assistant-utils.h	(working copy)
@@ -1,5 +1,5 @@
 /********************************************************************\
- * assistant-utils.h -- utility functions for creating druids       *
+ * assistant-utils.h -- utility functions for creating assistants   *
  * Copyright (C) 2001 Jeremy Collins                                *
  * Copyright (C) 2010 Geert Janssens                                *
  *                                                                  *
Index: src/gnome-utils/ui/osx_accel_map
===================================================================
--- src/gnome-utils/ui/osx_accel_map	(revision 21662)
+++ src/gnome-utils/ui/osx_accel_map	(working copy)
@@ -164,7 +164,7 @@
 ; (gtk_accel_path "<Actions>/MainWindowActions/ViewToolbarAction" "")
 ; (gtk_accel_path "<Actions>/gnc-plugin-file-history-actions/RecentFile7Action" "")
 ; (gtk_accel_path "<Actions>/gnc-plugin-aqbanking-actions/ABGetBalanceAction" "")
-; (gtk_accel_path "<Actions>/GncPluginPageAccountTreeActions/FileAddAccountHierarchyDruidAction" "")
+; (gtk_accel_path "<Actions>/GncPluginPageAccountTreeActions/FileAddAccountHierarchyAssistantAction" "")
 ; (gtk_accel_path "<Actions>/MainWindowActions/WindowNewAction" "")
 ; (gtk_accel_path "<Actions>/gnc-plugin-file-history-actions/RecentFile9Action" "")
 ; (gtk_accel_path "<Actions>/MainWindowActions/ViewSortByAction" "")
Index: src/gnome/dialog-new-user.c
===================================================================
--- src/gnome/dialog-new-user.c	(revision 21662)
+++ src/gnome/dialog-new-user.c	(working copy)
@@ -28,6 +28,7 @@
 
 #include "dialog-new-user.h"
 #include "dialog-utils.h"
+#include "dialog-file-access.h"
 #include "assistant-hierarchy.h"
 #include "gnc-engine.h"
 #include "gnc-gconf-utils.h"
@@ -72,6 +73,7 @@
 
     page = gnc_plugin_page_account_tree_new();
     gnc_main_window_open_page(NULL, page);
+    gnc_ui_file_access_for_save_as();
 }
 
 void
Index: src/gnome/assistant-hierarchy.c
===================================================================
--- src/gnome/assistant-hierarchy.c	(revision 21662)
+++ src/gnome/assistant-hierarchy.c	(working copy)
@@ -1108,11 +1108,6 @@
     data->category_description = GTK_TEXT_VIEW(gtk_builder_get_object (builder, "account_types_description"));
     data->account_list_added = FALSE;
 
-    /* FIXME -- what is this ?
-        color = &GNOME_DRUID_PAGE_EDGE(start_page)->textbox_color;
-        gtk_widget_modify_base(GTK_WIDGET(data->category_description), GTK_STATE_INSENSITIVE, color);
-        */
-
     /* Final Accounts Page */
     data->final_account_tree_container = GTK_WIDGET(gtk_builder_get_object (builder, "final_account_tree_box"));
     data->final_account_tree = NULL;
Index: src/gnome/assistant-loan.c
===================================================================
--- src/gnome/assistant-loan.c	(revision 21662)
+++ src/gnome/assistant-loan.c	(working copy)
@@ -207,7 +207,7 @@
 } LoanData;
 
 /**
- * The UI-side storage of the loan druid data.
+ * The UI-side storage of the loan assistant data.
  **/
 typedef struct LoanAssistantData_
 {
@@ -3067,7 +3067,7 @@
             }
             tcSX->schedule = rod->schedule;
             /* So it won't get destroyed when the close the
-             * Druid. */
+             * Assistant. */
             tcSX->instNum =
                 ld_calc_sx_instance_num(&tcSX->start, rod->schedule);
             rod->schedule = NULL;
Index: src/gnome/gnc-plugin-page-account-tree.c
===================================================================
--- src/gnome/gnc-plugin-page-account-tree.c	(revision 21662)
+++ src/gnome/gnc-plugin-page-account-tree.c	(working copy)
@@ -162,7 +162,7 @@
         G_CALLBACK (gnc_plugin_page_account_tree_cmd_new_account)
     },
     {
-        "FileAddAccountHierarchyDruidAction", GNC_STOCK_NEW_ACCOUNT, N_("New Account _Hierarchy..."), NULL,
+        "FileAddAccountHierarchyAssistantAction", GNC_STOCK_NEW_ACCOUNT, N_("New Account _Hierarchy..."), NULL,
         N_("Extend the current book by merging with new account type categories"),
         G_CALLBACK (gnc_plugin_page_account_tree_cmd_file_new_hierarchy)
     },
@@ -272,7 +272,7 @@
 static const gchar* readonly_inactive_actions[] =
 {
     "FileNewAccountAction",
-    "FileAddAccountHierarchyDruidAction",
+    "FileAddAccountHierarchyAssistantAction",
     "EditEditAccountAction",
     "EditDeleteAccountAction",
     "EditRenumberSubaccountsAction",
Index: src/gnome/ui/gnc-plugin-page-account-tree-ui.xml
===================================================================
--- src/gnome/ui/gnc-plugin-page-account-tree-ui.xml	(revision 21662)
+++ src/gnome/ui/gnc-plugin-page-account-tree-ui.xml	(working copy)
@@ -14,7 +14,7 @@
       <placeholder name="ActionsPlaceholder">
 	<separator name="ActionsSep1"/>
         <menuitem name="FileNewAccount" action="FileNewAccountAction"/>
-        <menuitem name="FileAddAccountHierarchyDruid" action="FileAddAccountHierarchyDruidAction"/>
+        <menuitem name="FileAddAccountHierarchyAssistant" action="FileAddAccountHierarchyAssistantAction"/>
         <separator name="ActionsSep2"/>
 	<menuitem name="ActionsTransfer" action="ActionsTransferAction"/>
 	<menuitem name="ActionsReconcile" action="ActionsReconcileAction"/>
