diff --git a/retroshare-gui/src/gui/HomePage.cpp b/retroshare-gui/src/gui/HomePage.cpp
index 7eabe9dd4..f5d7a5719 100644
--- a/retroshare-gui/src/gui/HomePage.cpp
+++ b/retroshare-gui/src/gui/HomePage.cpp
@@ -93,12 +93,12 @@ HomePage::HomePage(QWidget *parent) :
         menu->addAction(mIncludeIPsAct);
     }
 
-    QAction *useOldFormatAct = new QAction(QIcon(), tr("Use old certificate format"),this);
-    useOldFormatAct->setToolTip(tr("Displays the certificate format used up to version 0.6.5\nOld Retroshare nodes will not understand the\nnew short format"));
-    connect(useOldFormatAct, SIGNAL(triggered()), this, SLOT(updateOwnCert()));
-    useOldFormatAct->setCheckable(true);
-    useOldFormatAct->setChecked(false);
-    menu->addAction(useOldFormatAct);
+    mUseOldFormatAct = new QAction(QIcon(), tr("Use old certificate format"),this);
+    mUseOldFormatAct->setToolTip(tr("Displays the certificate format used up to version 0.6.5\nOld Retroshare nodes will not understand the\nnew short format"));
+    connect(mUseOldFormatAct, SIGNAL(triggered()), this, SLOT(updateOwnCert()));
+    mUseOldFormatAct->setCheckable(true);
+    mUseOldFormatAct->setChecked(false);
+    menu->addAction(mUseOldFormatAct);
 
     ui->shareButton->setMenu(menu);
 
diff --git a/retroshare-gui/src/gui/settings/CryptoPage.cpp b/retroshare-gui/src/gui/settings/CryptoPage.cpp
index 450ae4330..9f813209a 100755
--- a/retroshare-gui/src/gui/settings/CryptoPage.cpp
+++ b/retroshare-gui/src/gui/settings/CryptoPage.cpp
@@ -61,6 +61,10 @@ CryptoPage::CryptoPage(QWidget * parent, Qt::WindowFlags flags)
     //connect(ui.exportprofile,SIGNAL(clicked()), this, SLOT(profilemanager()));
     connect(ui.exportprofile,SIGNAL(clicked()), this, SLOT(exportProfile()));
 
+    // Remove this because it duplicates functionality of the HomePage.
+    ui.retroshareId_LB->hide();
+    ui.retroshareId_content_LB->hide();
+    ui.stackPageCertificate->hide();
 
 	ui.onlinesince->setText(DateTime::formatLongDateTime(Rshare::startupTime()));
 }
@@ -104,7 +108,7 @@ void CryptoPage::showEvent ( QShowEvent * /*event*/ )
 
         std::string invite ;
         rsPeers->getShortInvite(invite,rsPeers->getOwnId(),RetroshareInviteFlags::RADIX_FORMAT | RsPeers::defaultCertificateFlags);
-        ui.retroshareid->setText(QString::fromUtf8(invite.c_str()));
+        ui.retroshareId_content_LB->setText(QString::fromUtf8(invite.c_str()));
 		
         /* set retroshare version */
         ui.version->setText(Rshare::retroshareVersion(true));
diff --git a/retroshare-gui/src/gui/settings/CryptoPage.ui b/retroshare-gui/src/gui/settings/CryptoPage.ui
index 86b8e38b9..29a336721 100755
--- a/retroshare-gui/src/gui/settings/CryptoPage.ui
+++ b/retroshare-gui/src/gui/settings/CryptoPage.ui
@@ -7,25 +7,19 @@
     <x>0</x>
     <y>0</y>
     <width>869</width>
-    <height>487</height>
+    <height>493</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <item row="0" column="0">
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="tab">
-      <attribute name="title">
-       <string>Node information</string>
-      </attribute>
+    <widget class="QStackedWidget" name="stackedWidget">
+     <widget class="QWidget" name="stackPageNodeInfo" native="true">
       <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
         <widget class="QGroupBox" name="groupBox_1">
          <layout class="QGridLayout" name="gridLayout_4">
           <item row="6" column="0">
-           <widget class="QLabel" name="label">
+           <widget class="QLabel" name="retroshareId_LB">
             <property name="text">
              <string>Retroshare ID:</string>
             </property>
@@ -248,7 +242,7 @@
           <item row="14" column="1">
            <widget class="QPushButton" name="exportprofile">
             <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
             <property name="text">
              <string>Export</string>
@@ -474,7 +468,7 @@
            </widget>
           </item>
           <item row="6" column="1" colspan="3">
-           <widget class="QLabel" name="retroshareid">
+           <widget class="QLabel" name="retroshareId_content_LB">
             <property name="font">
              <font>
               <weight>75</weight>
@@ -539,10 +533,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab_2">
-      <attribute name="title">
-       <string>Certificate</string>
-      </attribute>
+     <widget class="QWidget" name="stackPageCertificate" native="true">
       <layout class="QGridLayout" name="gridLayout_7">
        <item row="0" column="0">
         <widget class="QPlainTextEdit" name="certplainTextEdit">