Index: gnucash/src/gnome/druid-loan.c
===================================================================
--- gnucash/src/gnome/druid-loan.c	(revision 20559)
+++ gnucash/src/gnome/druid-loan.c	(working copy)
@@ -61,6 +61,7 @@
 #  define PARAM_TABLE      "param_table"
 #  define ORIG_PRINC_ENTRY "orig_princ_ent"
 #  define IRATE_SPIN       "irate_spin"
+#  define IRATE_TYPE_COMBOBOX "irate_type_combobox"
 #  define TYPE_COMBOBOX    "type_combobox"
 #  define VAR_CONTAINER    "type_freq_frame"
 #  define LENGTH_SPIN      "len_spin"
@@ -198,6 +199,16 @@
     GNC_MONTHS = 0,
     GNC_YEARS
 } PeriodSize;
+/*type of interest rate entered*/
+typedef enum
+{
+    GNC_IRATE_SIMPLE,
+    GNC_IRATE_APR_DAILY,
+    GNC_IRATE_APR_WEEKLY,
+    GNC_IRATE_APR_MONTHLY,
+    GNC_IRATE_APR_QUARTERLY,
+    GNC_IRATE_APR_ANNUALLY
+} IRateType;
 
 /**
  * A transient struct used to collate the GDate and the gnc_numeric row-data
@@ -218,6 +229,7 @@
     Account *primaryAcct;
     gnc_numeric principal;
     float interestRate;
+    IRateType rateType;
     LoanType type;
     GList *loan_schedule;
     GDate *startDate;
@@ -277,6 +289,7 @@
     GtkSpinButton *prmLengthSpin;
     GtkComboBox   *prmLengthType;
     GtkSpinButton *prmRemainSpin;
+    GtkComboBox   *prmIrateType;
 
     /* opt = options */
     GtkVBox        *optVBox;
@@ -411,6 +424,7 @@
                                        gconstpointer crit );
 static void ld_create_sx_from_tcSX( LoanDruidData *ldd, toCreateSX *tcSX );
 static void ld_tcSX_free( gpointer data, gpointer user_data );
+static float ld_apr_to_simple_formula (float rate, float compounding_periods);
 
 struct LoanDruidData_*
 gnc_ui_sx_loan_druid_create(void)
@@ -890,6 +904,8 @@
         GET_CASTED_WIDGET( GTK_COMBO_BOX,      LENGTH_OPT );
     ldd->prmRemainSpin =
         GET_CASTED_WIDGET( GTK_SPIN_BUTTON,    REMAIN_SPIN );
+    ldd->prmIrateType =
+        GET_CASTED_WIDGET( GTK_COMBO_BOX,      IRATE_TYPE_COMBOBOX );
 
     /* opt = options */
     ldd->optVBox =
@@ -947,46 +963,264 @@
 
 }
 
+/* convert APR rate to simple rate based on formula r=q((1+i)^(1/q)-1) (r=interest rate, i=apr, q=compounding periods) */
+
+gfloat ld_apr_to_simple_formula (gfloat rate, gfloat compounding_periods)
+{
+    /* float percent_to_frac; - redundant */
+    gfloat simple_rate;
+    /* percent_to_frac= compounding_periods/100; - redundant */
+    simple_rate = compounding_periods * ((pow((1 + rate), (1 / compounding_periods))) - 1);
+    return (simple_rate);
+}
+
+
 static
 void
 ld_get_pmt_formula( LoanDruidData *ldd, GString *gstr )
 {
+    gint rate_case;
+    gfloat pass_thru_rate;
     g_assert( ldd != NULL );
     g_assert( gstr != NULL );
-    g_string_append_printf( gstr, "pmt( %.5f / %0.2f : %0.2f : %0.2f : 0 : 0 )",
-                            (ldd->ld.interestRate / 100),
-                            12.0,
-                            ( ldd->ld.numPer
-                              * ( ldd->ld.perSize == GNC_MONTHS ? 1 : 12 ) ) * 1.,
-                            gnc_numeric_to_double(ldd->ld.principal) );
+    rate_case = ldd->ld.rateType;
+    pass_thru_rate = ldd->ld.interestRate / 100;
+    switch (rate_case)
+    {
+    case GNC_IRATE_SIMPLE:
+    {
+        g_string_append_printf( gstr, "pmt( %.5f / %0.2f : %0.2f : %0.2f : 0 : 0 )",
+                                pass_thru_rate, 12.0,
+                                ( ldd->ld.numPer
+                                  * ( ldd->ld.perSize == GNC_MONTHS ? 1 : 12 ) ) * 1.,
+                                gnc_numeric_to_double(ldd->ld.principal) );
+    }
+    break;
+    case GNC_IRATE_APR_DAILY:
+    {
+        g_string_append_printf( gstr, "pmt( %.5f / %0.2f : %0.2f : %0.2f : 0 : 0 )",
+                                ld_apr_to_simple_formula(pass_thru_rate, 365),
+                                12.0,
+                                ( ldd->ld.numPer
+                                  * ( ldd->ld.perSize == GNC_MONTHS ? 1 : 12 ) ) * 1.,
+                                gnc_numeric_to_double(ldd->ld.principal) );
+    }
+    break;
+    case GNC_IRATE_APR_WEEKLY:
+    {
+        g_string_append_printf( gstr, "pmt( %.5f / %0.2f : %0.2f : %0.2f : 0 : 0 )",
+                                ld_apr_to_simple_formula(pass_thru_rate, 52),
+                                12.0,
+                                ( ldd->ld.numPer
+                                  * ( ldd->ld.perSize == GNC_MONTHS ? 1 : 12 ) ) * 1.,
+                                gnc_numeric_to_double(ldd->ld.principal) );
+    }
+    break;
+    case GNC_IRATE_APR_MONTHLY:
+    {
+        g_string_append_printf( gstr, "pmt( %.5f / %0.2f : %0.2f : %0.2f : 0 : 0 )",
+                                ld_apr_to_simple_formula(pass_thru_rate, 12),
+                                12.0,
+                                ( ldd->ld.numPer
+                                  * ( ldd->ld.perSize == GNC_MONTHS ? 1 : 12 ) ) * 1.,
+                                gnc_numeric_to_double(ldd->ld.principal) );
+    }
+    break;
+    case GNC_IRATE_APR_QUARTERLY:
+    {
+        g_string_append_printf( gstr, "pmt( %.5f / %0.2f : %0.2f : %0.2f : 0 : 0 )",
+                                ld_apr_to_simple_formula(pass_thru_rate, 4),
+                                12.0,
+                                ( ldd->ld.numPer
+                                  * ( ldd->ld.perSize == GNC_MONTHS ? 1 : 12 ) ) * 1.,
+                                gnc_numeric_to_double(ldd->ld.principal) );
+    }
+    break;
+    case GNC_IRATE_APR_ANNUALLY:
+    {
+        g_string_append_printf( gstr, "pmt( %.5f / %0.2f : %0.2f : %0.2f : 0 : 0 )",
+                                ld_apr_to_simple_formula(pass_thru_rate, 1),
+                                12.0,
+                                ( ldd->ld.numPer
+                                  * ( ldd->ld.perSize == GNC_MONTHS ? 1 : 12 ) ) * 1.,
+                                gnc_numeric_to_double(ldd->ld.principal) );
+    }
+    break;
+    default:
+        g_string_append_printf( gstr, "pmt( %.5f / %0.2f : %0.2f : %0.2f : 0 : 0 )",
+                                (ldd->ld.interestRate / 100),
+                                12.0,
+                                ( ldd->ld.numPer
+                                  * ( ldd->ld.perSize == GNC_MONTHS ? 1 : 12 ) ) * 1.,
+                                gnc_numeric_to_double(ldd->ld.principal) );
+        break;
+    }
 }
 
 static
 void
 ld_get_ppmt_formula( LoanDruidData *ldd, GString *gstr )
 {
+    gint rate_case;
+    gfloat pass_thru_rate;
     g_assert( ldd != NULL );
     g_assert( gstr != NULL );
-    g_string_printf( gstr, "ppmt( %.5f / %0.2f : i : %0.2f : %0.2f : 0 : 0 )",
-                     (ldd->ld.interestRate / 100),
-                     12.0,
-                     ( ldd->ld.numPer
-                       * ( ldd->ld.perSize == GNC_MONTHS ? 1 : 12 ) ) * 1.,
-                     gnc_numeric_to_double(ldd->ld.principal));
+    rate_case = ldd->ld.rateType;
+    pass_thru_rate = ldd->ld.interestRate / 100;
+    switch (rate_case)
+    {
+    case GNC_IRATE_SIMPLE:
+    {
+        g_string_printf( gstr, "ppmt( %.5f / %0.2f : i : %0.2f : %0.2f : 0 : 0 )",
+                         pass_thru_rate,
+                         12.0,
+                         ( ldd->ld.numPer
+                           * ( ldd->ld.perSize == GNC_MONTHS ? 1 : 12 ) ) * 1.,
+                         gnc_numeric_to_double(ldd->ld.principal));
+    }
+    break;
+    case GNC_IRATE_APR_DAILY:
+    {
+        g_string_printf( gstr, "ppmt( %.5f / %0.2f : i : %0.2f : %0.2f : 0 : 0 )",
+                         ld_apr_to_simple_formula(pass_thru_rate, 365),
+                         12.0,
+                         ( ldd->ld.numPer
+                           * ( ldd->ld.perSize == GNC_MONTHS ? 1 : 12 ) ) * 1.,
+                         gnc_numeric_to_double(ldd->ld.principal));
+    }
+    break;
+    case GNC_IRATE_APR_WEEKLY:
+    {
+        g_string_printf( gstr, "ppmt( %.5f / %0.2f : i : %0.2f : %0.2f : 0 : 0 )",
+                         ld_apr_to_simple_formula(pass_thru_rate, 52),
+                         12.0,
+                         ( ldd->ld.numPer
+                           * ( ldd->ld.perSize == GNC_MONTHS ? 1 : 12 ) ) * 1.,
+                         gnc_numeric_to_double(ldd->ld.principal));
+    }
+    break;
+    case GNC_IRATE_APR_MONTHLY:
+    {
+        g_string_printf( gstr, "ppmt( %.5f / %0.2f : i : %0.2f : %0.2f : 0 : 0 )",
+                         ld_apr_to_simple_formula(pass_thru_rate, 12),
+                         12.0,
+                         ( ldd->ld.numPer
+                           * ( ldd->ld.perSize == GNC_MONTHS ? 1 : 12 ) ) * 1.,
+                         gnc_numeric_to_double(ldd->ld.principal));
+    }
+    break;
+    case GNC_IRATE_APR_QUARTERLY:
+    {
+        g_string_printf( gstr, "ppmt( %.5f / %0.2f : i : %0.2f : %0.2f : 0 : 0 )",
+                         ld_apr_to_simple_formula(pass_thru_rate, 4),
+                         12.0,
+                         ( ldd->ld.numPer
+                           * ( ldd->ld.perSize == GNC_MONTHS ? 1 : 12 ) ) * 1.,
+                         gnc_numeric_to_double(ldd->ld.principal));
+    }
+    break;
+    case GNC_IRATE_APR_ANNUALLY:
+    {
+        g_string_printf( gstr, "ppmt( %.5f / %0.2f : i : %0.2f : %0.2f : 0 : 0 )",
+                         ld_apr_to_simple_formula(pass_thru_rate, 1),
+                         12.0,
+                         ( ldd->ld.numPer
+                           * ( ldd->ld.perSize == GNC_MONTHS ? 1 : 12 ) ) * 1.,
+                         gnc_numeric_to_double(ldd->ld.principal));
+    }
+    break;
+    default:
+        g_string_printf( gstr, "ppmt( %.5f / %0.2f : i : %0.2f : %0.2f : 0 : 0 )",
+                         (ldd->ld.interestRate / 100),
+                         12.0,
+                         ( ldd->ld.numPer
+                           * ( ldd->ld.perSize == GNC_MONTHS ? 1 : 12 ) ) * 1.,
+                         gnc_numeric_to_double(ldd->ld.principal));
+        break;
+    }
 }
 
 static
 void
 ld_get_ipmt_formula( LoanDruidData *ldd, GString *gstr )
 {
+    gint rate_case;
+    gfloat pass_thru_rate;
     g_assert( ldd != NULL );
     g_assert( gstr != NULL );
-    g_string_printf( gstr, "ipmt( %.5f / %0.2f : i : %0.2f : %0.2f : 0 : 0 )",
-                     (ldd->ld.interestRate / 100),
-                     12.0,
-                     ( ldd->ld.numPer
-                       * ( ldd->ld.perSize == GNC_MONTHS ? 1 : 12 ) ) * 1.,
-                     gnc_numeric_to_double( ldd->ld.principal ) );
+    rate_case = ldd->ld.rateType;
+    pass_thru_rate = ldd->ld.interestRate / 100;
+    switch (rate_case)
+    {
+    case GNC_IRATE_SIMPLE:
+    {
+        g_string_printf( gstr, "ipmt( %.5f / %0.2f : i : %0.2f : %0.2f : 0 : 0 )",
+                         pass_thru_rate,
+                         12.0,
+                         ( ldd->ld.numPer
+                           * ( ldd->ld.perSize == GNC_MONTHS ? 1 : 12 ) ) * 1.,
+                         gnc_numeric_to_double(ldd->ld.principal));
+    }
+    break;
+    case GNC_IRATE_APR_DAILY:
+    {
+        g_string_printf( gstr, "ipmt( %.5f / %0.2f : i : %0.2f : %0.2f : 0 : 0 )",
+                         ld_apr_to_simple_formula(pass_thru_rate, 365),
+                         12.0,
+                         ( ldd->ld.numPer
+                           * ( ldd->ld.perSize == GNC_MONTHS ? 1 : 12 ) ) * 1.,
+                         gnc_numeric_to_double(ldd->ld.principal));
+    }
+    break;
+    case GNC_IRATE_APR_WEEKLY:
+    {
+        g_string_printf( gstr, "ipmt( %.5f / %0.2f : i : %0.2f : %0.2f : 0 : 0 )",
+                         ld_apr_to_simple_formula(pass_thru_rate, 52),
+                         12.0,
+                         ( ldd->ld.numPer
+                           * ( ldd->ld.perSize == GNC_MONTHS ? 1 : 12 ) ) * 1.,
+                         gnc_numeric_to_double(ldd->ld.principal));
+    }
+    break;
+    case GNC_IRATE_APR_MONTHLY:
+    {
+        g_string_printf( gstr, "ipmt( %.5f / %0.2f : i : %0.2f : %0.2f : 0 : 0 )",
+                         ld_apr_to_simple_formula(pass_thru_rate, 12),
+                         12.0,
+                         ( ldd->ld.numPer
+                           * ( ldd->ld.perSize == GNC_MONTHS ? 1 : 12 ) ) * 1.,
+                         gnc_numeric_to_double(ldd->ld.principal));
+    }
+    break;
+    case GNC_IRATE_APR_QUARTERLY:
+    {
+        g_string_printf( gstr, "ipmt( %.5f / %0.2f : i : %0.2f : %0.2f : 0 : 0 )",
+                         ld_apr_to_simple_formula(pass_thru_rate, 4),
+                         12.0,
+                         ( ldd->ld.numPer
+                           * ( ldd->ld.perSize == GNC_MONTHS ? 1 : 12 ) ) * 1.,
+                         gnc_numeric_to_double(ldd->ld.principal));
+    }
+    break;
+    case GNC_IRATE_APR_ANNUALLY:
+    {
+        g_string_printf( gstr, "ipmt( %.5f / %0.2f : i : %0.2f : %0.2f : 0 : 0 )",
+                         ld_apr_to_simple_formula(pass_thru_rate, 1),
+                         12.0,
+                         ( ldd->ld.numPer
+                           * ( ldd->ld.perSize == GNC_MONTHS ? 1 : 12 ) ) * 1.,
+                         gnc_numeric_to_double(ldd->ld.principal));
+    }
+    break;
+    default:
+        g_string_printf( gstr, "ipmt( %.5f / %0.2f : i : %0.2f : %0.2f : 0 : 0 )",
+                         (ldd->ld.interestRate / 100),
+                         12.0,
+                         ( ldd->ld.numPer
+                           * ( ldd->ld.perSize == GNC_MONTHS ? 1 : 12 ) ) * 1.,
+                         gnc_numeric_to_double(ldd->ld.principal));
+        break;
+    }
 }
 
 static
@@ -1203,6 +1437,7 @@
     }
     ldd->ld.principal = gnc_amount_edit_get_amount( ldd->prmOrigPrincGAE );
     ldd->ld.interestRate = gtk_spin_button_get_value( ldd->prmIrateSpin );
+    ldd->ld.rateType = gtk_combo_box_get_active (ldd->prmIrateType );
     ldd->ld.type = gtk_combo_box_get_active( ldd->prmType );
     if ( ldd->ld.type != GNC_FIXED )
     {
@@ -1247,6 +1482,7 @@
     ldd = (LoanDruidData*)ud;
     gnc_amount_edit_set_amount( ldd->prmOrigPrincGAE, ldd->ld.principal );
     gtk_spin_button_set_value( ldd->prmIrateSpin, ldd->ld.interestRate );
+    gtk_combo_box_set_active( ldd->prmIrateType, ldd ->ld.rateType );
     gtk_combo_box_set_active( ldd->prmType, ldd->ld.type );
     if ( ldd->ld.type != GNC_FIXED )
     {
@@ -1446,6 +1682,7 @@
     LoanDruidData *ldd;
     GString *str;
 
+
     ldd = (LoanDruidData*)ud;
 
     if ( ldd->ld.repAmount )
@@ -1454,7 +1691,7 @@
     }
 
     str = g_string_sized_new( 64 );
-    ld_get_pmt_formula( ldd, str );
+    ld_get_pmt_formula( ldd, str);
     ldd->ld.repAmount = str->str;
     g_string_free( str, FALSE );
 
Index: gnucash/src/gnome/assistant-hierarchy.c
===================================================================
--- gnucash/src/gnome/assistant-hierarchy.c	(revision 20559)
+++ gnucash/src/gnome/assistant-hierarchy.c	(working copy)
@@ -101,12 +101,12 @@
 } hierarchy_data;
 
 G_MODULE_EXPORT void on_prepare (GtkAssistant  *assistant, GtkWidget *page,
-        hierarchy_data  *data);
+                                 hierarchy_data  *data);
 void on_choose_account_categories_prepare (hierarchy_data  *data);
 G_MODULE_EXPORT void select_all_clicked (GtkButton       *button,
-                         hierarchy_data  *data);
+        hierarchy_data  *data);
 G_MODULE_EXPORT void clear_all_clicked (GtkButton       *button,
-                        hierarchy_data  *data);
+                                        hierarchy_data  *data);
 void on_final_account_prepare (hierarchy_data  *data);
 G_MODULE_EXPORT void on_cancel (GtkAssistant      *gtkassistant, hierarchy_data *data);
 G_MODULE_EXPORT void on_finish (GtkAssistant  *gtkassistant, hierarchy_data *data);
@@ -428,20 +428,20 @@
 }
 
 G_MODULE_EXPORT void on_prepare (GtkAssistant  *assistant, GtkWidget *page,
-        hierarchy_data  *data)
+                                 hierarchy_data  *data)
 {
     gint currentpage = gtk_assistant_get_current_page(assistant);
 
     switch (gtk_assistant_get_current_page(assistant))
     {
-        case 2:
-            /* Current page is account selection */
-            on_choose_account_categories_prepare(data);
-            break;
-        case 3:
-            /* Current page is final account page */
-            on_final_account_prepare (data);
-            break;
+    case 2:
+        /* Current page is account selection */
+        on_choose_account_categories_prepare(data);
+        break;
+    case 3:
+        /* Current page is final account page */
+        on_final_account_prepare (data);
+        break;
     }
 
 }
@@ -1092,10 +1092,10 @@
     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);
-    */
+    /* 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"));
@@ -1121,7 +1121,7 @@
 
 GtkWidget*
 gnc_ui_hierarchy_assistant_with_callback(gboolean use_defaults,
-                                     GncHierarchyAssistantFinishedCallback when_finished)
+        GncHierarchyAssistantFinishedCallback when_finished)
 {
     return gnc_create_hierarchy_assistant(use_defaults, when_finished);
 }
Index: gnucash/src/gnome/glade/sched-xact.glade
===================================================================
--- gnucash/src/gnome/glade/sched-xact.glade	(revision 20559)
+++ gnucash/src/gnome/glade/sched-xact.glade	(working copy)
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+﻿<?xml version="1.0" encoding="UTF-8"?>
 <glade-interface>
   <!-- interface-requires gtk+ 2.10 -->
   <requires lib="gnome"/>
@@ -10,12 +10,10 @@
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox17">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <property name="spacing">8</property>
         <child>
           <widget class="GtkVBox" id="editor-vbox">
             <property name="visible">True</property>
-            <property name="orientation">vertical</property>
             <child>
               <widget class="GtkHBox" id="hbox96">
                 <property name="visible">True</property>
@@ -69,7 +67,6 @@
                 <child>
                   <widget class="GtkVBox" id="vbox106">
                     <property name="visible">True</property>
-                    <property name="orientation">vertical</property>
                     <child>
                       <widget class="GtkLabel" id="label847991">
                         <property name="visible">True</property>
@@ -312,7 +309,6 @@
                         <child>
                           <widget class="GtkVBox" id="vbox179">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
                             <child>
                               <widget class="GtkHBox" id="hbox172">
                                 <property name="visible">True</property>
@@ -539,7 +535,6 @@
                 <child>
                   <widget class="GtkVBox" id="vbox184">
                     <property name="visible">True</property>
-                    <property name="orientation">vertical</property>
                     <child>
                       <widget class="GtkHBox" id="gncfreq_hbox">
                         <property name="visible">True</property>
@@ -582,7 +577,6 @@
                   <widget class="GtkVBox" id="register_vbox">
                     <property name="visible">True</property>
                     <property name="border_width">1</property>
-                    <property name="orientation">vertical</property>
                     <child>
                       <placeholder/>
                     </child>
@@ -680,7 +674,6 @@
         <child>
           <widget class="GtkVBox" id="gncfreq_vbox">
             <property name="visible">True</property>
-            <property name="orientation">vertical</property>
             <child>
               <widget class="GtkTable" id="gncfreq_table">
                 <property name="visible">True</property>
@@ -863,7 +856,6 @@
                 <child>
                   <widget class="GtkVBox" id="vbox113">
                     <property name="visible">True</property>
-                    <property name="orientation">vertical</property>
                     <child>
                       <widget class="GtkHBox" id="hbox110">
                         <property name="visible">True</property>
@@ -922,7 +914,6 @@
                             <child>
                               <widget class="GtkVBox" id="vbox114">
                                 <property name="visible">True</property>
-                                <property name="orientation">vertical</property>
                                 <child>
                                   <widget class="GtkCheckButton" id="wd_check_sun">
                                     <property name="label" translatable="yes">Sunday</property>
@@ -978,7 +969,6 @@
                             <child>
                               <widget class="GtkVBox" id="vbox117">
                                 <property name="visible">True</property>
-                                <property name="orientation">vertical</property>
                                 <child>
                                   <widget class="GtkCheckButton" id="wd_check_wed">
                                     <property name="label" translatable="yes">Wednesday</property>
@@ -1034,7 +1024,6 @@
                             <child>
                               <widget class="GtkVBox" id="vbox162">
                                 <property name="visible">True</property>
-                                <property name="orientation">vertical</property>
                                 <child>
                                   <widget class="GtkCheckButton" id="wd_check_sat">
                                     <property name="label" translatable="yes">Saturday</property>
@@ -1100,7 +1089,6 @@
                       <widget class="GtkVBox" id="vbox119">
                         <property name="visible">True</property>
                         <property name="border_width">5</property>
-                        <property name="orientation">vertical</property>
                         <child>
                           <widget class="GtkHBox" id="hbox126">
                             <property name="visible">True</property>
@@ -1375,7 +1363,6 @@
                     <child>
                       <widget class="GtkVBox" id="vbox118">
                         <property name="visible">True</property>
-                        <property name="orientation">vertical</property>
                         <child>
                           <widget class="GtkHBox" id="hbox124">
                             <property name="visible">True</property>
@@ -1566,7 +1553,6 @@
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox23">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <property name="spacing">8</property>
         <child>
           <widget class="GtkHBox" id="hbox171">
@@ -1574,7 +1560,6 @@
             <child>
               <widget class="GtkVBox" id="vbox146">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
                 <child>
                   <widget class="GtkTable" id="param_table">
                     <property name="visible">True</property>
@@ -1676,7 +1661,6 @@
                         <child>
                           <widget class="GtkVBox" id="vbox147">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
                             <child>
                               <widget class="GtkRadioButton" id="never_end_button">
                                 <property name="label" translatable="yes">Never End</property>
@@ -1898,7 +1882,6 @@
               <widget class="GtkVBox" id="druid-vbox10">
                 <property name="visible">True</property>
                 <property name="border_width">5</property>
-                <property name="orientation">vertical</property>
                 <child>
                   <widget class="GtkTable" id="param_table">
                     <property name="visible">True</property>
@@ -1908,20 +1891,6 @@
                     <property name="column_spacing">5</property>
                     <property name="row_spacing">5</property>
                     <child>
-                      <widget class="GtkLabel" id="label847897">
-                        <property name="visible">True</property>
-                        <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Interest Rate:</property>
-                        <property name="justify">center</property>
-                      </widget>
-                      <packing>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
                       <widget class="GtkLabel" id="label847899">
                         <property name="visible">True</property>
                         <property name="xalign">1</property>
@@ -2171,26 +2140,24 @@
                       </packing>
                     </child>
                     <child>
-                      <placeholder/>
+                      <widget class="GtkComboBox" id="irate_type_combobox">
+                        <property name="visible">True</property>
+                        <property name="active">1</property>
+                        <property name="items" translatable="yes">Interest Rate
+APR (Compounded Daily)
+APR (Compounded Weekly)
+APR (Compounded Monthly)
+APR (Compounded Quarterly)
+APR (Compounded Annually)
+</property>
+                      </widget>
+                      <packing>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options">GTK_FILL</property>
+                      </packing>
                     </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
                   </widget>
                   <packing>
                     <property name="position">0</property>
@@ -2211,7 +2178,6 @@
               <widget class="GtkVBox" id="opt_vbox">
                 <property name="visible">True</property>
                 <property name="border_width">16</property>
-                <property name="orientation">vertical</property>
                 <child>
                   <widget class="GtkLabel" id="label847903">
                     <property name="visible">True</property>
@@ -2232,7 +2198,6 @@
                     <child>
                       <widget class="GtkVBox" id="vbox174">
                         <property name="visible">True</property>
-                        <property name="orientation">vertical</property>
                         <child>
                           <widget class="GtkCheckButton" id="opt_escrow_cb">
                             <property name="label" translatable="yes">... utilize an escrow account for payments?</property>
@@ -2320,7 +2285,6 @@
               <widget class="GtkVBox" id="druid-vbox12">
                 <property name="visible">True</property>
                 <property name="border_width">16</property>
-                <property name="orientation">vertical</property>
                 <child>
                   <widget class="GtkTable" id="repay_table">
                     <property name="visible">True</property>
@@ -2505,14 +2469,12 @@
               <widget class="GtkVBox" id="druid-vbox13">
                 <property name="visible">True</property>
                 <property name="border_width">16</property>
-                <property name="orientation">vertical</property>
                 <child>
                   <widget class="GtkEventBox" id="eventbox1">
                     <property name="visible">True</property>
                     <child>
                       <widget class="GtkVBox" id="vbox158">
                         <property name="visible">True</property>
-                        <property name="orientation">vertical</property>
                         <child>
                           <widget class="GtkTable" id="pay_table">
                             <property name="visible">True</property>
@@ -2716,7 +2678,6 @@
                                 <child>
                                   <widget class="GtkVBox" id="vbox159">
                                     <property name="visible">True</property>
-                                    <property name="orientation">vertical</property>
                                     <child>
                                       <widget class="GtkRadioButton" id="pay_txn_part_rb">
                                         <property name="label" translatable="yes">Part of Payment Transaction</property>
@@ -2735,7 +2696,6 @@
                                     <child>
                                       <widget class="GtkVBox" id="vbox160">
                                         <property name="visible">True</property>
-                                        <property name="orientation">vertical</property>
                                         <child>
                                           <widget class="GtkRadioButton" id="pay_uniq_freq_rb">
                                             <property name="label" translatable="yes">Other</property>
@@ -2816,11 +2776,9 @@
               <widget class="GtkVBox" id="druid-vbox14">
                 <property name="visible">True</property>
                 <property name="border_width">16</property>
-                <property name="orientation">vertical</property>
                 <child>
                   <widget class="GtkVBox" id="vbox177">
                     <property name="visible">True</property>
-                    <property name="orientation">vertical</property>
                     <child>
                       <widget class="GtkHBox" id="hbox176">
                         <property name="visible">True</property>
@@ -2845,7 +2803,6 @@
                             <child>
                               <widget class="GtkVBox" id="vbox178">
                                 <property name="visible">True</property>
-                                <property name="orientation">vertical</property>
                                 <child>
                                   <widget class="GtkComboBox" id="rev_range_opt">
                                     <property name="visible">True</property>
@@ -3325,11 +3282,9 @@
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox24">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <child>
           <widget class="GtkVBox" id="vbox181">
             <property name="visible">True</property>
-            <property name="orientation">vertical</property>
             <child>
               <widget class="GtkLabel" id="label847994">
                 <property name="visible">True</property>
@@ -3403,11 +3358,9 @@
       <widget class="GtkVPaned" id="sx-list-vbox">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
-        <property name="orientation">vertical</property>
         <child>
           <widget class="GtkVBox" id="vbox183">
             <property name="visible">True</property>
-            <property name="orientation">vertical</property>
             <child>
               <widget class="GtkLabel" id="label847992">
                 <property name="visible">True</property>
@@ -3460,7 +3413,6 @@
         <child>
           <widget class="GtkVBox" id="upcoming mumble">
             <property name="visible">True</property>
-            <property name="orientation">vertical</property>
             <child>
               <widget class="GtkLabel" id="label847993">
                 <property name="visible">True</property>
@@ -3521,11 +3473,9 @@
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox25">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <child>
           <widget class="GtkVBox" id="vbox182">
             <property name="visible">True</property>
-            <property name="orientation">vertical</property>
             <child>
               <widget class="GtkScrolledWindow" id="scrolledwindow21">
                 <property name="visible">True</property>
