diff --git a/src/sip/twitter/twitterconfigwidget.cpp b/src/sip/twitter/twitterconfigwidget.cpp
index 3981ce1b8..70c16a512 100644
--- a/src/sip/twitter/twitterconfigwidget.cpp
+++ b/src/sip/twitter/twitterconfigwidget.cpp
@@ -47,13 +47,15 @@ TwitterConfigWidget::TwitterConfigWidget(SipPlugin* plugin, QWidget *parent) :
     {
         ui->twitterStatusLabel->setText("Status: No saved credentials");
         ui->twitterAuthenticateButton->setText( "Authenticate" );
-        ui->twitterInstructionsBox->setVisible( false );
+        ui->twitterInstructionsInfoLabel->setVisible( false );
+        ui->twitterTweetGotTomahawkButton->setVisible( false );
     }
     else
     {
         ui->twitterStatusLabel->setText("Status: Credentials saved");
         ui->twitterAuthenticateButton->setText( "Re-authenticate" );
-        ui->twitterInstructionsBox->setVisible( true );
+        ui->twitterInstructionsInfoLabel->setVisible( true );
+        ui->twitterTweetGotTomahawkButton->setVisible( true );
     }
 
 }
@@ -77,7 +79,10 @@ TwitterConfigWidget::authenticateTwitter()
         s->setTwitterOAuthTokenSecret( twitAuth->oauthTokenSecret() );
         ui->twitterStatusLabel->setText("Status: Credentials saved");
         ui->twitterAuthenticateButton->setText( "Re-authenticate" );
-        ui->twitterInstructionsBox->setVisible( true );
+
+        ui->twitterInstructionsInfoLabel->setVisible( true );
+        ui->twitterTweetGotTomahawkButton->setVisible( true );
+
         TomahawkSettings::instance()->setTwitterCachedFriendsSinceId( 0 );
         TomahawkSettings::instance()->setTwitterCachedMentionsSinceId( 0 );
         m_plugin->connectPlugin( false );
@@ -90,7 +95,10 @@ TwitterConfigWidget::authenticateTwitter()
         s->setTwitterOAuthTokenSecret( QString() );
         ui->twitterStatusLabel->setText("Status: No saved credentials");
         ui->twitterAuthenticateButton->setText( "Authenticate" );
-        ui->twitterInstructionsBox->setVisible( false );
+
+        ui->twitterInstructionsInfoLabel->setVisible( false );
+        ui->twitterTweetGotTomahawkButton->setVisible( false );
+
         QMessageBox::critical( 0, QString("Tweetin' Error"), QString("There was an error validating your authentication") );
     }
 }
diff --git a/src/sip/twitter/twitterconfigwidget.ui b/src/sip/twitter/twitterconfigwidget.ui
index ad35c9d55..f7109915a 100644
--- a/src/sip/twitter/twitterconfigwidget.ui
+++ b/src/sip/twitter/twitterconfigwidget.ui
@@ -1,106 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <author/>
- <comment/>
- <exportmacro/>
  <class>TwitterConfigWidget</class>
  <widget class="QWidget" name="TwitterConfigWidget">
-<attribute name="title">
-       <string>Twitter</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_10">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>795</width>
+    <height>509</height>
+   </rect>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_10">
+   <item>
+    <layout class="QVBoxLayout" name="twitterVertLayout">
+     <item>
+      <widget class="QLabel" name="twitterInfoLabel">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Authenticating with Twitter allows you to discover and play music from your Twitter friends running Tomahawk.</string>
+       </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>This feature works best when you have set a static host name in the &quot;Network&quot; settings tab under Advanced Settings, but may work even if you do not. Tomahawk uses Direct Messages and this will only work when both Twitter users have followed each other.</string>
+       </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="twitterHorizontalLayout">
        <item>
-        <layout class="QVBoxLayout" name="twitterVertLayout">
-         <item>
-          <widget class="QLabel" name="twitterInfoLabel">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>Authenticating with Twitter allows you to discover and play music from your Twitter friends running Tomahawk.
-
-This feature works best when you have set a static host name in the &quot;Network&quot; settings tab under Advanced Settings, but may work even if you do not. Please note: this discovery uses Direct Messages and will only work when both Twitter users have followed each other. Tomahawk will attempt to &quot;clean up&quot; after itself to keep your Direct Message inbox tidy, but may miss some.
-
-When you press the button your web browser will launch and take you to Twitter.com to authenticate. You must copy and paste the PIN number into the dialog box that appears.</string>
-           </property>
-           <property name="wordWrap">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <layout class="QHBoxLayout" name="twitterHorizontalLayout">
-           <item>
-            <widget class="QLabel" name="twitterStatusLabel">
-             <property name="text">
-              <string>Status: No saved credentials</string>
-             </property>
-             <property name="textFormat">
-              <enum>Qt::AutoText</enum>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="twitterAuthenticateButton">
-             <property name="text">
-              <string>Authenticate with Twitter</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="twitterInstructionsBox">
-         <property name="title">
-          <string>Instructions</string>
+        <widget class="QLabel" name="twitterStatusLabel">
+         <property name="text">
+          <string>Status: No saved credentials</string>
+         </property>
+         <property name="textFormat">
+          <enum>Qt::AutoText</enum>
          </property>
-         <layout class="QVBoxLayout" name="verticalLayout_12">
-          <item>
-           <layout class="QVBoxLayout" name="twitterInstructionsVLayout">
-            <item>
-             <widget class="QLabel" name="twitterInstructionsInfoLabel">
-              <property name="text">
-               <string>How it works is simple: just press the button below to tweet &quot;Got Tomahawk?&quot; and some necessary information.  Then be (very) patient. Twitter is an asynchronous protocol so it can take a bit!
-
-If connections to peers seem to have been lost, just press the button again to re-post a tweet for resynchronization.
-</string>
-              </property>
-              <property name="wordWrap">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QPushButton" name="twitterTweetGotTomahawkButton">
-              <property name="text">
-               <string>Press here to have Tomahawk post a tweet</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-         </layout>
         </widget>
        </item>
        <item>
-        <spacer name="twitterVertSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
+        <widget class="QPushButton" name="twitterAuthenticateButton">
+         <property name="text">
+          <string>Authenticate with Twitter</string>
          </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
+        </widget>
        </item>
       </layout>
-     </widget>
- <pixmapfunction/>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="twitterInstructionsInfoLabel">
+     <property name="text">
+      <string>Here's how it works: just press the button below to tweet &quot;Got Tomahawk?&quot; and some necessary information.  Then be (very) patient. Twitter is an asynchronous protocol so it can take a bit!
+
+If connections to peers seem to have been lost, just press the button again to re-post a tweet for resynchronization.</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QPushButton" name="twitterTweetGotTomahawkButton">
+     <property name="text">
+      <string>Press here to have Tomahawk post a tweet</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="twitterVertSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
  <connections/>
-</ui>
\ No newline at end of file
+</ui>