diff --git a/src/gnome/gtkbuilder/dialog-fincalc.glade b/src/gnome/gtkbuilder/dialog-fincalc.glade
index 8ea2e9a..3ba3d66 100644
--- a/src/gnome/gtkbuilder/dialog-fincalc.glade
+++ b/src/gnome/gtkbuilder/dialog-fincalc.glade
@@ -1,29 +1,208 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkListStore" id="liststore1">
+    <columns>
+      <!-- column-name item -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Annual</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Semi-annual</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Tri-annual</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Quarterly</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Bi-monthly</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Monthly</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Semi-monthly</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Bi-weekly</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Weekly</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Daily (360)</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Daily (365)</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="liststore2">
+    <columns>
+      <!-- column-name item -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Annual</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Semi-annual</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Tri-annual</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Quarterly</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Bi-monthly</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Monthly</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Semi-monthly</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Bi-weekly</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Weekly</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Daily (360)</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Daily (365)</col>
+      </row>
+    </data>
+  </object>
   <object class="GtkDialog" id="Financial Calculator Dialog">
+    <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes">Loan Repayment Calculator</property>
     <property name="resizable">False</property>
     <property name="type_hint">normal</property>
-    <signal name="response" handler="fincalc_response_cb"/>
+    <signal name="response" handler="fincalc_response_cb" swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox10">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
+        <property name="can_focus">False</property>
         <property name="spacing">12</property>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area10">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="close_button">
+                <property name="label">gtk-close</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="hidden_button">
+                <property name="label">gtk-cancel</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="schedule_button">
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <child>
+                  <object class="GtkAlignment" id="alignment32">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xscale">0</property>
+                    <property name="yscale">0</property>
+                    <child>
+                      <object class="GtkHBox" id="hbox90">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">2</property>
+                        <child>
+                          <object class="GtkImage" id="image8">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="stock">gtk-ok</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label825">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Schedule</property>
+                            <property name="use_underline">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkHBox" id="hbox79">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <child>
               <object class="GtkVBox" id="vbox75">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
+                <property name="can_focus">False</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="label808">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">&lt;b&gt;Calculations&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
@@ -37,19 +216,21 @@
                 <child>
                   <object class="GtkAlignment" id="alignment18">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="left_padding">12</property>
                     <child>
                       <object class="GtkVBox" id="vbox77">
                         <property name="visible">True</property>
-                        <property name="orientation">vertical</property>
+                        <property name="can_focus">False</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkVBox" id="vbox78">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkLabel" id="label790">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="yalign">0.75</property>
                                 <property name="label" translatable="yes">Payment periods</property>
@@ -64,6 +245,7 @@
                             <child>
                               <object class="GtkHBox" id="payment_periods_hbox">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="spacing">6</property>
                                 <child>
                                   <placeholder/>
@@ -76,7 +258,7 @@
                                     <property name="receives_default">False</property>
                                     <property name="tooltip_text" translatable="yes">Clear the entry.</property>
                                     <property name="use_stock">True</property>
-                                    <signal name="clicked" handler="fincalc_amount_clear_clicked_cb"/>
+                                    <signal name="clicked" handler="fincalc_amount_clear_clicked_cb" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -87,21 +269,26 @@
                                 </child>
                               </object>
                               <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkVBox" id="vbox79">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkLabel" id="label799">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="yalign">0.75</property>
                                 <property name="label" translatable="yes">Interest rate</property>
@@ -115,6 +302,7 @@
                             <child>
                               <object class="GtkHBox" id="interest_rate_hbox">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="spacing">6</property>
                                 <child>
                                   <placeholder/>
@@ -125,9 +313,9 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="tooltip_text" translatable="yes">Clear the entry</property>
+                                    <property name="tooltip_text" translatable="yes">Clear the entry.</property>
                                     <property name="use_stock">True</property>
-                                    <signal name="clicked" handler="fincalc_amount_clear_clicked_cb"/>
+                                    <signal name="clicked" handler="fincalc_amount_clear_clicked_cb" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -138,21 +326,26 @@
                                 </child>
                               </object>
                               <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkVBox" id="vbox80">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkLabel" id="label800">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="yalign">0.75</property>
                                 <property name="label" translatable="yes">Present value</property>
@@ -166,6 +359,7 @@
                             <child>
                               <object class="GtkHBox" id="present_value_hbox">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="spacing">6</property>
                                 <child>
                                   <placeholder/>
@@ -176,9 +370,9 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="tooltip_text" translatable="yes">Clear the entry</property>
+                                    <property name="tooltip_text" translatable="yes">Clear the entry.</property>
                                     <property name="use_stock">True</property>
-                                    <signal name="clicked" handler="fincalc_amount_clear_clicked_cb"/>
+                                    <signal name="clicked" handler="fincalc_amount_clear_clicked_cb" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -189,21 +383,26 @@
                                 </child>
                               </object>
                               <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
                             <property name="position">2</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkVBox" id="vbox81">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkLabel" id="label817">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="yalign">0.75</property>
                                 <property name="label" translatable="yes">Periodic payment</property>
@@ -217,6 +416,7 @@
                             <child>
                               <object class="GtkHBox" id="periodic_payment_hbox">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="spacing">6</property>
                                 <child>
                                   <placeholder/>
@@ -227,9 +427,9 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="tooltip_text" translatable="yes">Clear the entry</property>
+                                    <property name="tooltip_text" translatable="yes">Clear the entry.</property>
                                     <property name="use_stock">True</property>
-                                    <signal name="clicked" handler="fincalc_amount_clear_clicked_cb"/>
+                                    <signal name="clicked" handler="fincalc_amount_clear_clicked_cb" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -240,21 +440,26 @@
                                 </child>
                               </object>
                               <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
                             <property name="position">3</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkVBox" id="vbox82">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkLabel" id="label802">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="yalign">0.75</property>
                                 <property name="label" translatable="yes">Future value</property>
@@ -268,6 +473,7 @@
                             <child>
                               <object class="GtkHBox" id="future_value_hbox">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="spacing">6</property>
                                 <child>
                                   <placeholder/>
@@ -278,9 +484,9 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="tooltip_text" translatable="yes">Clear the entry</property>
+                                    <property name="tooltip_text" translatable="yes">Clear the entry.</property>
                                     <property name="use_stock">True</property>
-                                    <signal name="clicked" handler="fincalc_amount_clear_clicked_cb"/>
+                                    <signal name="clicked" handler="fincalc_amount_clear_clicked_cb" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -291,21 +497,27 @@
                                 </child>
                               </object>
                               <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
                             <property name="position">4</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkAlignment" id="alignment31">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="top_padding">6</property>
                             <child>
                               <object class="GtkHButtonBox" id="hbuttonbox1">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkButton" id="calc_button">
                                     <property name="visible">True</property>
@@ -314,19 +526,22 @@
                                     <property name="can_default">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="tooltip_text" translatable="yes">Recalculate the (single) blank entry in the above fields.</property>
-                                    <signal name="clicked" handler="fincalc_calc_clicked_cb"/>
+                                    <signal name="clicked" handler="fincalc_calc_clicked_cb" swapped="no"/>
                                     <child>
                                       <object class="GtkAlignment" id="alignment30">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xscale">0</property>
                                         <property name="yscale">0</property>
                                         <child>
                                           <object class="GtkHBox" id="hbox84">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="spacing">2</property>
                                             <child>
                                               <object class="GtkImage" id="image7">
                                                 <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
                                                 <property name="stock">gtk-execute</property>
                                               </object>
                                               <packing>
@@ -338,6 +553,7 @@
                                             <child>
                                               <object class="GtkLabel" id="label824">
                                                 <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
                                                 <property name="label" translatable="yes">Calculate</property>
                                                 <property name="use_underline">True</property>
                                               </object>
@@ -362,6 +578,8 @@
                             </child>
                           </object>
                           <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
                             <property name="position">5</property>
                           </packing>
                         </child>
@@ -369,20 +587,26 @@
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkVSeparator" id="vseparator2">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
               <packing>
                 <property name="expand">False</property>
+                <property name="fill">True</property>
                 <property name="padding">6</property>
                 <property name="position">1</property>
               </packing>
@@ -390,11 +614,12 @@
             <child>
               <object class="GtkVBox" id="vbox76">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
+                <property name="can_focus">False</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="label809">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">&lt;b&gt;Payment Options&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
@@ -408,16 +633,34 @@
                 <child>
                   <object class="GtkAlignment" id="alignment19">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="left_padding">12</property>
                     <child>
                       <object class="GtkTable" id="table9">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="n_rows">9</property>
                         <property name="n_columns">3</property>
                         <property name="column_spacing">12</property>
                         <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
                           <object class="GtkLabel" id="some_label">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">Payment Total:</property>
                             <property name="justify">center</property>
                           </object>
@@ -425,12 +668,13 @@
                             <property name="top_attach">8</property>
                             <property name="bottom_attach">9</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="payment_total_label">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">total</property>
                             <property name="justify">center</property>
@@ -441,24 +685,26 @@
                             <property name="top_attach">8</property>
                             <property name="bottom_attach">9</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label818">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="top_attach">3</property>
                             <property name="bottom_attach">4</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label819">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                           </object>
                           <packing>
@@ -477,7 +723,7 @@
                             <property name="use_underline">True</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
-                            <signal name="toggled" handler="fincalc_compounding_radio_toggled"/>
+                            <signal name="toggled" handler="fincalc_compounding_radio_toggled" swapped="no"/>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -485,7 +731,7 @@
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
@@ -504,16 +750,18 @@
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkAlignment" id="alignment23">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="left_padding">12</property>
                             <child>
                               <object class="GtkLabel" id="label816">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Type:</property>
                               </object>
@@ -529,10 +777,12 @@
                         <child>
                           <object class="GtkAlignment" id="alignment22">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="left_padding">12</property>
                             <child>
                               <object class="GtkLabel" id="label815">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Frequency:</property>
                                 <property name="use_underline">True</property>
@@ -548,10 +798,12 @@
                         <child>
                           <object class="GtkAlignment" id="alignment24">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="left_padding">12</property>
                             <child>
                               <object class="GtkLabel" id="label811">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Frequency:</property>
                                 <property name="use_underline">True</property>
@@ -568,10 +820,12 @@
                         <child>
                           <object class="GtkAlignment" id="alignment25">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="left_padding">12</property>
                             <child>
                               <object class="GtkLabel" id="label812">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">When paid:</property>
                               </object>
@@ -599,7 +853,7 @@
                             <property name="top_attach">5</property>
                             <property name="bottom_attach">6</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
@@ -612,7 +866,7 @@
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">radiobutton4</property>
-                            <signal name="toggled" handler="fincalc_update_calc_button_cb"/>
+                            <signal name="toggled" handler="fincalc_update_calc_button_cb" swapped="no"/>
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
@@ -620,12 +874,13 @@
                             <property name="top_attach">5</property>
                             <property name="bottom_attach">6</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label797">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">&lt;b&gt;Compounding:&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
@@ -634,12 +889,13 @@
                           <packing>
                             <property name="right_attach">3</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label813">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">&lt;b&gt;Period:&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
@@ -649,12 +905,13 @@
                             <property name="top_attach">4</property>
                             <property name="bottom_attach">5</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkComboBox" id="payment_combo">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="model">liststore2</property>
                             <child>
                               <object class="GtkCellRendererText" id="cellrenderertext2"/>
@@ -675,6 +932,7 @@
                         <child>
                           <object class="GtkComboBox" id="compounding_combo">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="model">liststore1</property>
                             <child>
                               <object class="GtkCellRendererText" id="cellrenderertext1"/>
@@ -692,126 +950,29 @@
                             <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
                       </object>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">2</property>
               </packing>
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area10">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="close_button">
-                <property name="label">gtk-close</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="hidden_button">
-                <property name="label">gtk-cancel</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="schedule_button">
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment32">
-                    <property name="visible">True</property>
-                    <property name="xscale">0</property>
-                    <property name="yscale">0</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox90">
-                        <property name="visible">True</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <object class="GtkImage" id="image8">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-ok</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label825">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">Schedule</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
       </object>
     </child>
     <action-widgets>
@@ -820,86 +981,4 @@
       <action-widget response="-5">schedule_button</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkListStore" id="liststore1">
-    <columns>
-      <!-- column-name item -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Annual</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Semi-annual</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Tri-annual</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Quarterly</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Bi-monthly</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Monthly</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Semi-monthly</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Bi-weekly</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Weekly</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Daily (360)</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Daily (365)</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="liststore2">
-    <columns>
-      <!-- column-name item -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Annual</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Semi-annual</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Tri-annual</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Quarterly</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Bi-monthly</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Monthly</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Semi-monthly</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Bi-weekly</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Weekly</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Daily (360)</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Daily (365)</col>
-      </row>
-    </data>
-  </object>
 </interface>
