diff --git a/src/business/business-gnome/dialog-order.c b/src/business/business-gnome/dialog-order.c
index 7fb88ce68e..65b53d2657 100644
--- a/src/business/business-gnome/dialog-order.c
+++ b/src/business/business-gnome/dialog-order.c
@@ -310,7 +310,7 @@ gnc_order_new (GtkWidget *parent, GNCBook *bookp)
 		      GTK_SIGNAL_FUNC (gnc_order_on_close_cb),
 		      &created_order);
 
-  gtk_window_set_modal (GTK_WINDOW (ow->dialog), TRUE);
+  // gtk_window_set_modal (GTK_WINDOW (ow->dialog), TRUE);
 
   gtk_main ();
 
@@ -330,7 +330,7 @@ gnc_order_edit (GtkWidget *parent, GncOrder *order)
 		      GTK_SIGNAL_FUNC (gnc_order_on_close_cb),
 		      NULL);
 
-  gtk_window_set_modal (GTK_WINDOW (ow->dialog), TRUE);
+  // gtk_window_set_modal (GTK_WINDOW (ow->dialog), TRUE);
 
   gtk_main ();
 
diff --git a/src/business/business-gnome/order.glade b/src/business/business-gnome/order.glade
index d806d71c70..3d181d9531 100644
--- a/src/business/business-gnome/order.glade
+++ b/src/business/business-gnome/order.glade
@@ -23,8 +23,9 @@
   <type>GTK_WINDOW_TOPLEVEL</type>
   <position>GTK_WIN_POS_NONE</position>
   <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
+  <default_width>790</default_width>
+  <allow_shrink>True</allow_shrink>
+  <allow_grow>True</allow_grow>
   <auto_shrink>False</auto_shrink>
   <auto_close>False</auto_close>
   <hide_on_close>False</hide_on_close>
@@ -37,15 +38,15 @@
     <spacing>8</spacing>
     <child>
       <padding>4</padding>
-      <expand>False</expand>
-      <fill>False</fill>
+      <expand>True</expand>
+      <fill>True</fill>
     </child>
 
     <widget>
       <class>GtkHButtonBox</class>
       <child_name>GnomeDialog:action_area</child_name>
       <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_DEFAULT_STYLE</layout_style>
+      <layout_style>GTK_BUTTONBOX_SPREAD</layout_style>
       <spacing>8</spacing>
       <child_min_width>85</child_min_width>
       <child_min_height>27</child_min_height>
@@ -53,7 +54,7 @@
       <child_ipad_y>0</child_ipad_y>
       <child>
 	<padding>0</padding>
-	<expand>False</expand>
+	<expand>True</expand>
 	<fill>True</fill>
 	<pack>GTK_PACK_END</pack>
       </child>
@@ -105,7 +106,6 @@
       <widget>
 	<class>GtkFrame</class>
 	<name>ledger_frame</name>
-	<border_width>3</border_width>
 	<label>Order Entries</label>
 	<label_xalign>0</label_xalign>
 	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
@@ -118,7 +118,7 @@
 	<widget>
 	  <class>GtkVBox</class>
 	  <name>ledger_vbox</name>
-	  <border_width>3</border_width>
+	  <border_width>2</border_width>
 	  <homogeneous>False</homogeneous>
 	  <spacing>0</spacing>
 
diff --git a/src/business/business-ledger/gncEntryLedgerLayout.c b/src/business/business-ledger/gncEntryLedgerLayout.c
index 842a740370..2bd467a98c 100644
--- a/src/business/business-ledger/gncEntryLedgerLayout.c
+++ b/src/business/business-ledger/gncEntryLedgerLayout.c
@@ -56,23 +56,23 @@ static void gnc_entry_ledger_layout_add_cells (GncEntryLedger *ledger,
     { ENTRY_DESC_CELL, QUICKFILL_CELL_TYPE_NAME,
       N_("sample:Description of an Entry")+7, CELL_ALIGN_LEFT, FALSE, FALSE },
     { ENTRY_ACTN_CELL, COMBO_CELL_TYPE_NAME,
-      N_("sample:Expenses:Automobile:Gasoline")+7, CELL_ALIGN_RIGHT,
+      N_("sample:Action")+7, CELL_ALIGN_RIGHT,
       FALSE, FALSE },
-    { ENTRY_QTY_CELL, PRICE_CELL_TYPE_NAME, N_("sample:999,999.000") + 7,
+    { ENTRY_QTY_CELL, PRICE_CELL_TYPE_NAME, N_("sample:9,999.00") + 7,
       CELL_ALIGN_RIGHT, FALSE, FALSE },
-    { ENTRY_PRIC_CELL, PRICE_CELL_TYPE_NAME, N_("sample:999,999.000") + 7,
+    { ENTRY_PRIC_CELL, PRICE_CELL_TYPE_NAME, N_("sample:999,999.00") + 7,
       CELL_ALIGN_RIGHT, FALSE, FALSE },
-    { ENTRY_TAX_CELL, PRICE_CELL_TYPE_NAME, N_("sample:999,999.000") + 7,
+    { ENTRY_TAX_CELL, PRICE_CELL_TYPE_NAME, N_("sample:9,999.00") + 7,
       CELL_ALIGN_RIGHT, FALSE, FALSE },
-    { ENTRY_DISC_CELL, PRICE_CELL_TYPE_NAME, N_("sample:999,999.000") + 7,
+    { ENTRY_DISC_CELL, PRICE_CELL_TYPE_NAME, N_("sample:9,999.00") + 7,
       CELL_ALIGN_RIGHT, FALSE, FALSE },
-    { ENTRY_ACCT_CELL, COMBO_CELL_TYPE_NAME, N_("sample:Transfer:Account")+7,
+    { ENTRY_ACCT_CELL, COMBO_CELL_TYPE_NAME, N_("sample:Xfer:Account")+7,
       CELL_ALIGN_LEFT, FALSE, FALSE },
     { ENTRY_TAXACC_CELL, COMBO_CELL_TYPE_NAME, N_("sample:Tax:Account")+7,
       CELL_ALIGN_LEFT, FALSE, FALSE },
-    { ENTRY_TAXTYPE_CELL, RECN_CELL_TYPE_NAME, N_("sample:TaxType")+7,
+    { ENTRY_TAXTYPE_CELL, RECN_CELL_TYPE_NAME, N_("sample:TT")+7,
       CELL_ALIGN_LEFT, FALSE, FALSE },
-    { ENTRY_DISTYPE_CELL, RECN_CELL_TYPE_NAME, N_("sample:DiscountType")+7,
+    { ENTRY_DISTYPE_CELL, RECN_CELL_TYPE_NAME, N_("sample:DT")+7,
       CELL_ALIGN_LEFT, FALSE, FALSE }
   };
   int i;
diff --git a/src/business/business-ledger/gncEntryLedgerModel.c b/src/business/business-ledger/gncEntryLedgerModel.c
index e2fef7e5ce..71211bf0ee 100644
--- a/src/business/business-ledger/gncEntryLedgerModel.c
+++ b/src/business/business-ledger/gncEntryLedgerModel.c
@@ -66,7 +66,7 @@ static const char * get_distype_label (VirtualLocation virt_loc, gpointer data)
 
 static const char * get_pric_label (VirtualLocation virt_loc, gpointer data)
 {
-  return _("Price");
+  return _("Unit Price");
 }
 
 static const char * get_qty_label (VirtualLocation virt_loc, gpointer data)