diff --git a/addresses.py b/addresses.py
index 97d1ab95..ce7aa4ff 100644
--- a/addresses.py
+++ b/addresses.py
@@ -275,6 +275,7 @@ if __name__ == "__main__":
     print 'addressVersionNumber', addressVersionNumber
     print 'streamNumber', streamNumber
     print 'length of data(the ripe hash):', len(data)
+    print 'ripe data:', data.encode('hex')
 
     print '\n\nNow let us try making an address with given 2048-bit n and e values.'
     testn = 16691381808213609635656612695328489234826227577985206736118595570304213887605602327717776979169783795560145663031146864154748634207927153095849203939039346778471192284119479329875655789428795925773927040539038073349089996911318012189546542694411685389074592231210678771416758973061752125295462189928432307067746658691146428088703129795340914596189054255127032271420140641112277113597275245807890920656563056790943850440012709593297328230145129809419550219898595770524436575484115680960823105256137731976622290028349172297572826751147335728017861413787053794003722218722212196385625462088929496952843002425059308041193
diff --git a/settings.py b/settings.py
index 378cd305..097ad033 100644
--- a/settings.py
+++ b/settings.py
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'settings.ui'
 #
-# Created: Tue Feb 26 13:33:44 2013
-#      by: PyQt4 UI code generator 4.9.4
+# Created: Wed Feb 27 00:00:12 2013
+#      by: PyQt4 UI code generator 4.9.5
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -30,35 +30,35 @@ class Ui_settingsDialog(object):
         self.tabUserInterface = QtGui.QWidget()
         self.tabUserInterface.setEnabled(True)
         self.tabUserInterface.setObjectName(_fromUtf8("tabUserInterface"))
-        self.formLayout = QtGui.QFormLayout(self.tabUserInterface)
-        self.formLayout.setObjectName(_fromUtf8("formLayout"))
+        self.gridLayout_5 = QtGui.QGridLayout(self.tabUserInterface)
+        self.gridLayout_5.setObjectName(_fromUtf8("gridLayout_5"))
         self.checkBoxStartOnLogon = QtGui.QCheckBox(self.tabUserInterface)
         self.checkBoxStartOnLogon.setObjectName(_fromUtf8("checkBoxStartOnLogon"))
-        self.formLayout.setWidget(0, QtGui.QFormLayout.SpanningRole, self.checkBoxStartOnLogon)
+        self.gridLayout_5.addWidget(self.checkBoxStartOnLogon, 0, 0, 1, 1)
         self.checkBoxStartInTray = QtGui.QCheckBox(self.tabUserInterface)
         self.checkBoxStartInTray.setObjectName(_fromUtf8("checkBoxStartInTray"))
-        self.formLayout.setWidget(1, QtGui.QFormLayout.SpanningRole, self.checkBoxStartInTray)
+        self.gridLayout_5.addWidget(self.checkBoxStartInTray, 1, 0, 1, 1)
         self.checkBoxMinimizeToTray = QtGui.QCheckBox(self.tabUserInterface)
         self.checkBoxMinimizeToTray.setChecked(True)
         self.checkBoxMinimizeToTray.setObjectName(_fromUtf8("checkBoxMinimizeToTray"))
-        self.formLayout.setWidget(2, QtGui.QFormLayout.SpanningRole, self.checkBoxMinimizeToTray)
+        self.gridLayout_5.addWidget(self.checkBoxMinimizeToTray, 2, 0, 1, 1)
         self.checkBoxShowTrayNotifications = QtGui.QCheckBox(self.tabUserInterface)
         self.checkBoxShowTrayNotifications.setObjectName(_fromUtf8("checkBoxShowTrayNotifications"))
-        self.formLayout.setWidget(3, QtGui.QFormLayout.SpanningRole, self.checkBoxShowTrayNotifications)
+        self.gridLayout_5.addWidget(self.checkBoxShowTrayNotifications, 3, 0, 1, 1)
         self.checkBoxPortableMode = QtGui.QCheckBox(self.tabUserInterface)
         self.checkBoxPortableMode.setObjectName(_fromUtf8("checkBoxPortableMode"))
-        self.formLayout.setWidget(4, QtGui.QFormLayout.SpanningRole, self.checkBoxPortableMode)
+        self.gridLayout_5.addWidget(self.checkBoxPortableMode, 4, 0, 1, 1)
+        self.label_7 = QtGui.QLabel(self.tabUserInterface)
+        self.label_7.setWordWrap(True)
+        self.label_7.setObjectName(_fromUtf8("label_7"))
+        self.gridLayout_5.addWidget(self.label_7, 5, 0, 1, 1)
         self.labelSettingsNote = QtGui.QLabel(self.tabUserInterface)
         self.labelSettingsNote.setText(_fromUtf8(""))
         self.labelSettingsNote.setWordWrap(True)
         self.labelSettingsNote.setObjectName(_fromUtf8("labelSettingsNote"))
-        self.formLayout.setWidget(5, QtGui.QFormLayout.LabelRole, self.labelSettingsNote)
-        self.label_7 = QtGui.QLabel(self.tabUserInterface)
-        self.label_7.setWordWrap(True)
-        self.label_7.setObjectName(_fromUtf8("label_7"))
-        self.formLayout.setWidget(5, QtGui.QFormLayout.FieldRole, self.label_7)
+        self.gridLayout_5.addWidget(self.labelSettingsNote, 6, 0, 1, 1)
         spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.formLayout.setItem(6, QtGui.QFormLayout.SpanningRole, spacerItem)
+        self.gridLayout_5.addItem(spacerItem, 7, 0, 1, 1)
         self.tabWidgetSettings.addTab(self.tabUserInterface, _fromUtf8(""))
         self.tabNetworkSettings = QtGui.QWidget()
         self.tabNetworkSettings.setObjectName(_fromUtf8("tabNetworkSettings"))
diff --git a/settings.ui b/settings.ui
index 6fa0ad9c..bf569277 100644
--- a/settings.ui
+++ b/settings.ui
@@ -36,22 +36,22 @@
       <attribute name="title">
        <string>User Interface</string>
       </attribute>
-      <layout class="QFormLayout" name="formLayout">
-       <item row="0" column="0" colspan="2">
+      <layout class="QGridLayout" name="gridLayout_5">
+       <item row="0" column="0">
         <widget class="QCheckBox" name="checkBoxStartOnLogon">
          <property name="text">
           <string>Start Bitmessage on user login</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="0" colspan="2">
+       <item row="1" column="0">
         <widget class="QCheckBox" name="checkBoxStartInTray">
          <property name="text">
           <string>Start Bitmessage in the tray (don't show main window)</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="0" colspan="2">
+       <item row="2" column="0">
         <widget class="QCheckBox" name="checkBoxMinimizeToTray">
          <property name="text">
           <string>Minimize to tray</string>
@@ -61,14 +61,14 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="0" colspan="2">
+       <item row="3" column="0">
         <widget class="QCheckBox" name="checkBoxShowTrayNotifications">
          <property name="text">
           <string>Show notification when message received and minimzed to tray</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="0" colspan="2">
+       <item row="4" column="0">
         <widget class="QCheckBox" name="checkBoxPortableMode">
          <property name="text">
           <string>Run in Portable Mode</string>
@@ -76,16 +76,6 @@
         </widget>
        </item>
        <item row="5" column="0">
-        <widget class="QLabel" name="labelSettingsNote">
-         <property name="text">
-          <string/>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="1">
         <widget class="QLabel" name="label_7">
          <property name="text">
           <string>In Portable Mode, messages and config files are stored in the same directory as the program rather than the normal application-data folder. This makes it convenient to run Bitmessage from a USB thumb drive.</string>
@@ -95,7 +85,17 @@
          </property>
         </widget>
        </item>
-       <item row="6" column="0" colspan="2">
+       <item row="6" column="0">
+        <widget class="QLabel" name="labelSettingsNote">
+         <property name="text">
+          <string/>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="0">
         <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>