diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py
index eb140fb9..cb3e9147 100644
--- a/src/bitmessageqt/__init__.py
+++ b/src/bitmessageqt/__init__.py
@@ -2240,7 +2240,7 @@ class MyForm(settingsmixin.SMainWindow):
             ))
 
     def click_pushButtonFetchNamecoinID(self):
-        identities = str(self.ui.lineEditTo.text().toUtf8()).split(";")
+        identities = str(self.lineEditTo.text().toUtf8()).split(";")
         err, addr = self.namecoin.query(identities[-1].strip())
         if err is not None:
             self.updateStatusBar(
@@ -4096,9 +4096,9 @@ class MyForm(settingsmixin.SMainWindow):
             logger.warning(
                 'There was a problem testing for a Namecoin daemon.'
                 ' Hiding the Fetch Namecoin ID button')
-            self.ui.pushButtonFetchNamecoinID.hide()
+            self.pushButtonFetchNamecoinID.hide()
         else:
-            self.ui.pushButtonFetchNamecoinID.show()
+            self.pushButtonFetchNamecoinID.show()
 
     def initSettings(self):
         self.loadSettings()
diff --git a/src/bitmessageqt/bitmessageui.ui b/src/bitmessageqt/bitmessageui.ui
index fef40be6..515de98b 100644
--- a/src/bitmessageqt/bitmessageui.ui
+++ b/src/bitmessageqt/bitmessageui.ui
@@ -70,7 +70,7 @@
           <item>
            <layout class="QVBoxLayout" name="verticalLayout_12">
             <item>
-             <widget class="QTreeWidget" name="treeWidgetYourIdentities">
+             <widget class="STreeWidget" name="treeWidgetYourIdentities">
               <property name="maximumSize">
                <size>
                 <width>200</width>
@@ -150,7 +150,7 @@
              </layout>
             </item>
             <item>
-             <widget class="QTableWidget" name="tableWidgetInbox">
+             <widget class="STableWidget" name="tableWidgetInbox">
               <property name="editTriggers">
                <set>QAbstractItemView::NoEditTriggers</set>
               </property>
@@ -216,7 +216,7 @@
              </widget>
             </item>
             <item>
-             <widget class="QTextEdit" name="textEditInboxMessage">
+             <widget class="MessageView" name="textEditInboxMessage">
               <property name="baseSize">
                <size>
                 <width>0</width>
@@ -248,7 +248,7 @@
           <item>
            <layout class="QVBoxLayout" name="verticalLayout_2">
             <item>
-             <widget class="QTableWidget" name="tableWidgetAddressBook">
+             <widget class="STableWidget" name="tableWidgetAddressBook">
               <property name="maximumSize">
                <size>
                 <width>200</width>
@@ -337,9 +337,9 @@
             <item>
              <widget class="QTabWidget" name="tabWidgetSend">
               <property name="currentIndex">
-               <number>0</number>
+               <number>1</number>
               </property>
-              <widget class="QWidget" name="tab">
+              <widget class="QWidget" name="sendDirect">
                <attribute name="title">
                 <string>Send ordinary Message</string>
                </attribute>
@@ -392,12 +392,12 @@
                    </layout>
                   </item>
                   <item>
-                   <widget class="QTextEdit" name="textEditMessage">
+                   <widget class="MessageCompose" name="textEditMessage">
                     <property name="html">
                      <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Droid Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2';&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                     </property>
                    </widget>
@@ -406,7 +406,7 @@ p, li { white-space: pre-wrap; }
                 </item>
                </layout>
               </widget>
-              <widget class="QWidget" name="tab_2">
+              <widget class="QWidget" name="sendBroadcast">
                <attribute name="title">
                 <string>Send Message to your Subscribers</string>
                </attribute>
@@ -449,12 +449,12 @@ p, li { white-space: pre-wrap; }
                    </layout>
                   </item>
                   <item>
-                   <widget class="QTextEdit" name="textEditMessageBroadcast">
+                   <widget class="MessageCompose" name="textEditMessageBroadcast">
                     <property name="html">
                      <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Droid Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2';&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                     </property>
                    </widget>
@@ -581,7 +581,14 @@ p, li { white-space: pre-wrap; }
                 </property>
                </widget>
               </item>
-              <item>
+              <item alignment="Qt::AlignRight">
+               <widget class="QPushButton" name="pushButtonClear">
+                <property name="text">
+                 <string>Clear</string>
+                </property>
+               </widget>
+              </item>
+              <item alignment="Qt::AlignRight">
                <widget class="QPushButton" name="pushButtonSend">
                 <property name="maximumSize">
                  <size>
@@ -617,7 +624,7 @@ p, li { white-space: pre-wrap; }
           <item>
            <layout class="QVBoxLayout" name="verticalLayout_3">
             <item>
-             <widget class="QTreeWidget" name="treeWidgetSubscriptions">
+             <widget class="STreeWidget" name="treeWidgetSubscriptions">
               <property name="maximumSize">
                <size>
                 <width>200</width>
@@ -703,7 +710,7 @@ p, li { white-space: pre-wrap; }
              </layout>
             </item>
             <item>
-             <widget class="QTableWidget" name="tableWidgetInboxSubscriptions">
+             <widget class="STableWidget" name="tableWidgetInboxSubscriptions">
               <property name="editTriggers">
                <set>QAbstractItemView::NoEditTriggers</set>
               </property>
@@ -769,7 +776,7 @@ p, li { white-space: pre-wrap; }
              </widget>
             </item>
             <item>
-             <widget class="QTextEdit" name="textEditInboxMessageSubscriptions">
+             <widget class="MessageView" name="textEditInboxMessageSubscriptions">
               <property name="baseSize">
                <size>
                 <width>0</width>
@@ -893,7 +900,7 @@ p, li { white-space: pre-wrap; }
              </layout>
             </item>
             <item>
-             <widget class="QTableWidget" name="tableWidgetInboxChans">
+             <widget class="STableWidget" name="tableWidgetInboxChans">
               <property name="editTriggers">
                <set>QAbstractItemView::NoEditTriggers</set>
               </property>
@@ -959,7 +966,7 @@ p, li { white-space: pre-wrap; }
              </widget>
             </item>
             <item>
-             <widget class="QTextEdit" name="textEditInboxMessageChans">
+             <widget class="MessageView" name="textEditInboxMessageChans">
               <property name="baseSize">
                <size>
                 <width>0</width>
@@ -977,7 +984,7 @@ p, li { white-space: pre-wrap; }
         </item>
        </layout>
       </widget>
-      <widget class="QWidget" name="blackwhitelist">
+      <widget class="Blacklist" name="blackwhitelist">
        <attribute name="icon">
         <iconset resource="bitmessage_icons.qrc">
          <normaloff>:/newPrefix/images/blacklist.png</normaloff>:/newPrefix/images/blacklist.png</iconset>
@@ -985,91 +992,8 @@ p, li { white-space: pre-wrap; }
        <attribute name="title">
         <string>Blacklist</string>
        </attribute>
-       <layout class="QGridLayout" name="gridLayout_6">
-        <item row="0" column="0" colspan="2">
-         <widget class="QRadioButton" name="radioButtonBlacklist">
-          <property name="text">
-           <string>Use a Blacklist (Allow all incoming messages except those on the Blacklist)</string>
-          </property>
-          <property name="checked">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0" colspan="2">
-         <widget class="QRadioButton" name="radioButtonWhitelist">
-          <property name="text">
-           <string>Use a Whitelist (Block all incoming messages except those on the Whitelist)</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="0">
-         <widget class="QPushButton" name="pushButtonAddBlacklist">
-          <property name="text">
-           <string>Add new entry</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1">
-         <spacer name="horizontalSpacer_8">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>689</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="3" column="0" colspan="2">
-         <widget class="QTableWidget" name="tableWidgetBlacklist">
-          <property name="alternatingRowColors">
-           <bool>true</bool>
-          </property>
-          <property name="selectionMode">
-           <enum>QAbstractItemView::SingleSelection</enum>
-          </property>
-          <property name="selectionBehavior">
-           <enum>QAbstractItemView::SelectRows</enum>
-          </property>
-          <property name="sortingEnabled">
-           <bool>true</bool>
-          </property>
-          <attribute name="horizontalHeaderCascadingSectionResizes">
-           <bool>true</bool>
-          </attribute>
-          <attribute name="horizontalHeaderDefaultSectionSize">
-           <number>400</number>
-          </attribute>
-          <attribute name="horizontalHeaderHighlightSections">
-           <bool>false</bool>
-          </attribute>
-          <attribute name="horizontalHeaderShowSortIndicator" stdset="0">
-           <bool>false</bool>
-          </attribute>
-          <attribute name="horizontalHeaderStretchLastSection">
-           <bool>true</bool>
-          </attribute>
-          <attribute name="verticalHeaderVisible">
-           <bool>false</bool>
-          </attribute>
-          <column>
-           <property name="text">
-            <string>Name or Label</string>
-           </property>
-          </column>
-          <column>
-           <property name="text">
-            <string>Address</string>
-           </property>
-          </column>
-         </widget>
-        </item>
-       </layout>
       </widget>
-      <widget class="QWidget" name="networkstatus">
+      <widget class="NetworkStatus" name="networkstatus">
        <attribute name="icon">
         <iconset resource="bitmessage_icons.qrc">
          <normaloff>:/newPrefix/images/networkstatus.png</normaloff>:/newPrefix/images/networkstatus.png</iconset>
@@ -1077,214 +1001,6 @@ p, li { white-space: pre-wrap; }
        <attribute name="title">
         <string>Network Status</string>
        </attribute>
-       <widget class="QPushButton" name="pushButtonStatusIcon">
-        <property name="geometry">
-         <rect>
-          <x>680</x>
-          <y>440</y>
-          <width>21</width>
-          <height>23</height>
-         </rect>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="icon">
-         <iconset resource="bitmessage_icons.qrc">
-          <normaloff>:/newPrefix/images/redicon.png</normaloff>:/newPrefix/images/redicon.png</iconset>
-        </property>
-        <property name="flat">
-         <bool>true</bool>
-        </property>
-       </widget>
-       <widget class="QTableWidget" name="tableWidgetConnectionCount">
-        <property name="geometry">
-         <rect>
-          <x>20</x>
-          <y>70</y>
-          <width>241</width>
-          <height>241</height>
-         </rect>
-        </property>
-        <property name="palette">
-         <palette>
-          <active>
-           <colorrole role="Base">
-            <brush brushstyle="SolidPattern">
-             <color alpha="255">
-              <red>212</red>
-              <green>208</green>
-              <blue>200</blue>
-             </color>
-            </brush>
-           </colorrole>
-          </active>
-          <inactive>
-           <colorrole role="Base">
-            <brush brushstyle="SolidPattern">
-             <color alpha="255">
-              <red>212</red>
-              <green>208</green>
-              <blue>200</blue>
-             </color>
-            </brush>
-           </colorrole>
-          </inactive>
-          <disabled>
-           <colorrole role="Base">
-            <brush brushstyle="SolidPattern">
-             <color alpha="255">
-              <red>212</red>
-              <green>208</green>
-              <blue>200</blue>
-             </color>
-            </brush>
-           </colorrole>
-          </disabled>
-         </palette>
-        </property>
-        <property name="frameShape">
-         <enum>QFrame::Box</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Plain</enum>
-        </property>
-        <property name="showDropIndicator" stdset="0">
-         <bool>false</bool>
-        </property>
-        <property name="alternatingRowColors">
-         <bool>true</bool>
-        </property>
-        <property name="selectionMode">
-         <enum>QAbstractItemView::NoSelection</enum>
-        </property>
-        <attribute name="horizontalHeaderCascadingSectionResizes">
-         <bool>true</bool>
-        </attribute>
-        <attribute name="horizontalHeaderHighlightSections">
-         <bool>false</bool>
-        </attribute>
-        <attribute name="horizontalHeaderStretchLastSection">
-         <bool>true</bool>
-        </attribute>
-        <attribute name="verticalHeaderVisible">
-         <bool>false</bool>
-        </attribute>
-        <column>
-         <property name="text">
-          <string>Stream #</string>
-         </property>
-        </column>
-        <column>
-         <property name="text">
-          <string>Connections</string>
-         </property>
-        </column>
-       </widget>
-       <widget class="QLabel" name="labelTotalConnections">
-        <property name="geometry">
-         <rect>
-          <x>20</x>
-          <y>30</y>
-          <width>401</width>
-          <height>16</height>
-         </rect>
-        </property>
-        <property name="text">
-         <string>Total connections:</string>
-        </property>
-       </widget>
-       <widget class="QLabel" name="labelStartupTime">
-        <property name="geometry">
-         <rect>
-          <x>320</x>
-          <y>110</y>
-          <width>331</width>
-          <height>20</height>
-         </rect>
-        </property>
-        <property name="text">
-         <string>Since startup:</string>
-        </property>
-       </widget>
-       <widget class="QLabel" name="labelMessageCount">
-        <property name="geometry">
-         <rect>
-          <x>350</x>
-          <y>130</y>
-          <width>361</width>
-          <height>16</height>
-         </rect>
-        </property>
-        <property name="text">
-         <string>Processed 0 person-to-person messages.</string>
-        </property>
-       </widget>
-       <widget class="QLabel" name="labelPubkeyCount">
-        <property name="geometry">
-         <rect>
-          <x>350</x>
-          <y>170</y>
-          <width>331</width>
-          <height>16</height>
-         </rect>
-        </property>
-        <property name="text">
-         <string>Processed 0 public keys.</string>
-        </property>
-       </widget>
-       <widget class="QLabel" name="labelBroadcastCount">
-        <property name="geometry">
-         <rect>
-          <x>350</x>
-          <y>150</y>
-          <width>351</width>
-          <height>16</height>
-         </rect>
-        </property>
-        <property name="text">
-         <string>Processed 0 broadcasts.</string>
-        </property>
-       </widget>
-       <widget class="QLabel" name="labelLookupsPerSecond">
-        <property name="geometry">
-         <rect>
-          <x>320</x>
-          <y>250</y>
-          <width>291</width>
-          <height>16</height>
-         </rect>
-        </property>
-        <property name="text">
-         <string>Inventory lookups per second: 0</string>
-        </property>
-       </widget>
-       <widget class="QLabel" name="labelBytesRecvCount">
-        <property name="geometry">
-         <rect>
-          <x>350</x>
-          <y>210</y>
-          <width>251</width>
-          <height>16</height>
-         </rect>
-        </property>
-        <property name="text">
-         <string>Down: 0 KB/s</string>
-        </property>
-       </widget>
-       <widget class="QLabel" name="labelBytesSentCount">
-        <property name="geometry">
-         <rect>
-          <x>350</x>
-          <y>230</y>
-          <width>251</width>
-          <height>16</height>
-         </rect>
-        </property>
-        <property name="text">
-         <string>Up: 0 KB/s</string>
-        </property>
-       </widget>
       </widget>
      </widget>
     </item>
@@ -1296,7 +1012,7 @@ p, li { white-space: pre-wrap; }
      <x>0</x>
      <y>0</y>
      <width>885</width>
-     <height>27</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -1306,6 +1022,7 @@ p, li { white-space: pre-wrap; }
     <addaction name="actionManageKeys"/>
     <addaction name="actionDeleteAllTrashedMessages"/>
     <addaction name="actionRegenerateDeterministicAddresses"/>
+    <addaction name="actionNetworkSwitch"/>
     <addaction name="actionExit"/>
    </widget>
    <widget class="QMenu" name="menuSettings">
@@ -1319,6 +1036,7 @@ p, li { white-space: pre-wrap; }
      <string>Help</string>
     </property>
     <addaction name="actionHelp"/>
+    <addaction name="actionSupport"/>
     <addaction name="actionAbout"/>
    </widget>
    <addaction name="menuFile"/>
@@ -1347,8 +1065,7 @@ p, li { white-space: pre-wrap; }
    </property>
    <property name="icon">
     <iconset theme="dialog-password">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Manage keys</string>
@@ -1357,8 +1074,7 @@ p, li { white-space: pre-wrap; }
   <action name="actionExit">
    <property name="icon">
     <iconset theme="application-exit">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Quit</string>
@@ -1370,8 +1086,7 @@ p, li { white-space: pre-wrap; }
   <action name="actionHelp">
    <property name="icon">
     <iconset theme="help-contents">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Help</string>
@@ -1383,8 +1098,7 @@ p, li { white-space: pre-wrap; }
   <action name="actionAbout">
    <property name="icon">
     <iconset theme="help-about">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>About</string>
@@ -1393,8 +1107,7 @@ p, li { white-space: pre-wrap; }
   <action name="actionSettings">
    <property name="icon">
     <iconset theme="document-properties">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Settings</string>
@@ -1403,8 +1116,7 @@ p, li { white-space: pre-wrap; }
   <action name="actionRegenerateDeterministicAddresses">
    <property name="icon">
     <iconset theme="view-refresh">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Regenerate deterministic addresses</string>
@@ -1413,8 +1125,7 @@ p, li { white-space: pre-wrap; }
   <action name="actionDeleteAllTrashedMessages">
    <property name="icon">
     <iconset theme="user-trash">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Delete all trashed messages</string>
@@ -1423,14 +1134,55 @@ p, li { white-space: pre-wrap; }
   <action name="actionJoinChan">
    <property name="icon">
     <iconset theme="contact-new">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Join / Create chan</string>
    </property>
   </action>
+  <action name="actionSupport">
+   <property name="text">
+    <string>Contact Support</string>
+   </property>
+  </action>
+  <action name="actionNetworkSwitch">
+   <property name="text">
+    <string>Go offline</string>
+   </property>
+  </action>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>Blacklist</class>
+   <extends>QWidget</extends>
+   <header>bitmessageqt.blacklist</header>
+  </customwidget>
+  <customwidget>
+   <class>NetworkStatus</class>
+   <extends>QWidget</extends>
+   <header>bitmessageqt.networkstatus</header>
+  </customwidget>
+  <customwidget>
+   <class>MessageView</class>
+   <extends>QTextEdit</extends>
+   <header>bitmessageqt.messageview</header>
+  </customwidget>
+  <customwidget>
+   <class>STreeWidget</class>
+   <extends>QTreeWidget</extends>
+   <header>bitmessageqt.settingsmixin</header>
+  </customwidget>
+  <customwidget>
+   <class>STableWidget</class>
+   <extends>QTableWidget</extends>
+   <header>bitmessageqt.settingsmixin</header>
+  </customwidget>
+  <customwidget>
+   <class>MessageCompose</class>
+   <extends>QTextEdit</extends>
+   <header>bitmessageqt.messagecompose</header>
+  </customwidget>
+ </customwidgets>
  <tabstops>
   <tabstop>tableWidgetInbox</tabstop>
   <tabstop>textEditInboxMessage</tabstop>
@@ -1440,12 +1192,6 @@ p, li { white-space: pre-wrap; }
   <tabstop>textEditMessage</tabstop>
   <tabstop>pushButtonSend</tabstop>
   <tabstop>pushButtonAddSubscription</tabstop>
-  <tabstop>radioButtonBlacklist</tabstop>
-  <tabstop>radioButtonWhitelist</tabstop>
-  <tabstop>pushButtonAddBlacklist</tabstop>
-  <tabstop>tableWidgetBlacklist</tabstop>
-  <tabstop>tableWidgetConnectionCount</tabstop>
-  <tabstop>pushButtonStatusIcon</tabstop>
  </tabstops>
  <resources>
   <include location="bitmessage_icons.qrc"/>