diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp
index 52a5628a9..dfc73ca6b 100644
--- a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp
+++ b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp
@@ -45,8 +45,8 @@
 #include "util/DateTime.h"
 #include "util/misc.h"
 
-static QMap<RsPeerId, ConfCertDialog*> instances_ssl;
-static QMap<RsPgpId, ConfCertDialog*> instances_pgp;
+QMap<RsPeerId, ConfCertDialog*> ConfCertDialog::instances_ssl;
+QMap<RsPgpId,  ConfCertDialog*> ConfCertDialog::instances_pgp;
 
 ConfCertDialog *ConfCertDialog::instance(const RsPeerId& peer_id)
 {
@@ -128,184 +128,173 @@ void ConfCertDialog::loadAll()
 
 void ConfCertDialog::load()
 {
-    RsPeerDetails detail;
+	RsPeerDetails detail;
 
-    if(!rsPeers->getPeerDetails(peerId, detail))
-    {
-        QMessageBox::information(this,
-                                 tr("RetroShare"),
-                                 tr("Error : cannot get peer details."));
-        close();
-        return;
-    }
+	if(!rsPeers->getPeerDetails(peerId, detail))
+	{
+		QMessageBox::information(this,
+		                         tr("RetroShare"),
+		                         tr("Error : cannot get peer details."));
+		close();
+		return;
+	}
 
-      //ui.pgpfingerprint->setText(QString::fromUtf8(detail.name.c_str()));
-      ui.peerid->setText(QString::fromStdString(detail.id.toStdString()));
-      
-      nameAndLocation = QString("%1 (%2)").arg(QString::fromUtf8(detail.name.c_str())).arg(QString::fromUtf8(detail.location.c_str()));
+	//ui.pgpfingerprint->setText(QString::fromUtf8(detail.name.c_str()));
+	ui.peerid->setText(QString::fromStdString(detail.id.toStdString()));
 
-      ui.headerFrame->setHeaderText(nameAndLocation);
+	nameAndLocation = QString("%1 (%2)").arg(QString::fromUtf8(detail.name.c_str()), QString::fromUtf8(detail.location.c_str()));
+
+	ui.headerFrame->setHeaderText(nameAndLocation);
 
 
 	RetroShareLink link = RetroShareLink::createPerson(detail.gpg_id);
 	ui.pgpfingerprint->setText(link.toHtml());
 	ui.pgpfingerprint->setToolTip(link.title());
 
-      ui.avatar->setId(ChatId(peerId));
+	ui.avatar->setId(ChatId(peerId));
 
-		 ui.loc->setText(QString::fromUtf8(detail.location.c_str()));
-		 // Dont Show a timestamp in RS calculate the day
-		 ui.lastcontact->setText(DateTime::formatLongDateTime(detail.lastConnect));
+	ui.loc->setText(QString::fromUtf8(detail.location.c_str()));
+	// Dont Show a timestamp in RS calculate the day
+	ui.lastcontact->setText(DateTime::formatLongDateTime(detail.lastConnect));
 
-		 /* set retroshare version */
-		 std::string version;
-		 rsDisc->getPeerVersion(detail.id, version);
-		 ui.version->setText(QString::fromStdString(version));
-		
-		 /* Custom state string */ 
-		 QString statustring =  QString::fromUtf8(rsMsgs->getCustomStateString(detail.id).c_str());
-     	 ui.statusmessage->setText(statustring);
+	/* set retroshare version */
+	std::string version;
+	rsDisc->getPeerVersion(detail.id, version);
+	ui.version->setText(QString::fromStdString(version));
+
+	/* Custom state string */
+	QString statustring =  QString::fromUtf8(rsMsgs->getCustomStateString(detail.id).c_str());
+	ui.statusmessage->setText(statustring);
 
 
-		 RsPeerCryptoParams cdet ;
-		 if(RsControl::instance()->getPeerCryptoDetails(detail.id,cdet) && cdet.connexion_state!=0)
-			 ui.crypto_info->setText(QString::fromStdString(cdet.cipher_name));
-		 else
-			 ui.crypto_info->setText(tr("Not connected")) ;
+	RsPeerCryptoParams cdet ;
+	if(RsControl::instance()->getPeerCryptoDetails(detail.id,cdet) && cdet.connexion_state!=0)
+		ui.crypto_info->setText(QString::fromStdString(cdet.cipher_name));
+	else
+		ui.crypto_info->setText(tr("Not connected")) ;
 
-		 if (detail.isHiddenNode)
-		 {
-			 // enable only the first row and set name of the first label to "Hidden Address"
-			 ui.l_localAddress->setText(tr("Hidden Address"));
+	if (detail.isHiddenNode)
+	{
+		// enable only the first row and set name of the first label to "Hidden Address"
+		ui.l_localAddress->setText(tr("Hidden Address"));
 
-			 ui.l_extAddress->setEnabled(false);
-			 ui.extAddress->setEnabled(false);
-			 ui.l_portExternal->setEnabled(false);
-			 ui.extPort->setEnabled(false);
+		ui.l_extAddress->setEnabled(false);
+		ui.extAddress->setEnabled(false);
+		ui.l_portExternal->setEnabled(false);
+		ui.extPort->setEnabled(false);
 
-			 ui.l_dynDNS->setEnabled(false);
-			 ui.dynDNS->setEnabled(false);
+		ui.l_dynDNS->setEnabled(false);
+		ui.dynDNS->setEnabled(false);
 
-			 /* set hidden address */
-			 ui.localAddress->setText(QString::fromStdString(detail.hiddenNodeAddress));
-			 ui.localPort -> setValue(detail.hiddenNodePort);
+		/* set hidden address */
+		ui.localAddress->setText(QString::fromStdString(detail.hiddenNodeAddress));
+		ui.localPort -> setValue(detail.hiddenNodePort);
 
-			 // set everything else to none
-			 ui.extAddress->setText(tr("none"));
-			 ui.extPort->setValue(0);
-			 ui.dynDNS->setText(tr("none"));
-		 }
-		 else
-		 {
-			 // enable everything and set name of the first label to "Local Address"
-			 ui.l_localAddress->setText(tr("Local Address"));
+		// set everything else to none
+		ui.extAddress->setText(tr("none"));
+		ui.extPort->setValue(0);
+		ui.dynDNS->setText(tr("none"));
+	}
+	else
+	{
+		// enable everything and set name of the first label to "Local Address"
+		ui.l_localAddress->setText(tr("Local Address"));
 
-			 ui.l_extAddress->setEnabled(true);
-			 ui.extAddress->setEnabled(true);
-			 ui.l_portExternal->setEnabled(true);
-			 ui.extPort->setEnabled(true);
+		ui.l_extAddress->setEnabled(true);
+		ui.extAddress->setEnabled(true);
+		ui.l_portExternal->setEnabled(true);
+		ui.extPort->setEnabled(true);
 
-			 ui.l_dynDNS->setEnabled(true);
-			 ui.dynDNS->setEnabled(true);
+		ui.l_dynDNS->setEnabled(true);
+		ui.dynDNS->setEnabled(true);
 
-			 /* set local address */			 
-			 ui.localAddress->setText(QString::fromStdString(detail.localAddr));
-			 ui.localPort -> setValue(detail.localPort);
-			 /* set the server address */
-			 ui.extAddress->setText(QString::fromStdString(detail.extAddr));
-			 ui.extPort -> setValue(detail.extPort);
+		/* set local address */
+		ui.localAddress->setText(QString::fromStdString(detail.localAddr));
+		ui.localPort -> setValue(detail.localPort);
+		/* set the server address */
+		ui.extAddress->setText(QString::fromStdString(detail.extAddr));
+		ui.extPort -> setValue(detail.extPort);
 
-			 ui.dynDNS->setText(QString::fromStdString(detail.dyndns));
-		 }
+		ui.dynDNS->setText(QString::fromStdString(detail.dyndns));
+	}
 
-		 ui.statusline->setText(StatusDefs::connectStateString(detail));
+	ui.statusline->setText(StatusDefs::connectStateString(detail));
 
-		 ui.ipAddressList->clear();
-		 for(std::list<std::string>::const_iterator it(detail.ipAddressList.begin());it!=detail.ipAddressList.end();++it)
-			 ui.ipAddressList->addItem(QString::fromStdString(*it));
+	ui.ipAddressList->clear();
+	for(std::list<std::string>::const_iterator it(detail.ipAddressList.begin());it!=detail.ipAddressList.end();++it)
+		ui.ipAddressList->addItem(QString::fromStdString(*it));
 
-		 ui.loc->show();
-		 ui.label_loc->show();
-		 ui.statusline->show();
-		 ui.label_status->show();
-		 ui.lastcontact->show();
-		 ui.label_last_contact->show();
-		 ui.version->show();
-		 ui.label_version->show();
+	ui.loc->show();
+	ui.label_loc->show();
+	ui.statusline->show();
+	ui.label_status->show();
+	ui.lastcontact->show();
+	ui.label_last_contact->show();
+	ui.version->show();
+	ui.label_version->show();
 
-		 //ui.groupBox->show();
-		 ui.groupBox_4->show();
-		 //ui.tabWidget->show();
-         //ui.rsid->hide();
-         //ui.label_rsid->hide();
-		 ui.pgpfingerprint->show();
-         //ui.pgpfingerprint_label->show();
+	//ui.groupBox->show();
+	ui.detail_GBox->show();
+	//ui.tabWidget->show();
+	//ui.rsid->hide();
+	//ui.label_rsid->hide();
+	ui.pgpfingerprint->show();
+	//ui.pgpfingerprint_label->show();
 
-		ui.stabWidget->setTabEnabled(2,true) ;
-		ui.stabWidget->setTabEnabled(3,true) ;
-		ui.stabWidget->setTabEnabled(4,true) ;
+	ui.stabWidget->setTabEnabled(PageDetails,true) ;
+	ui.stabWidget->setTabEnabled(PageTrust,true) ;
+	ui.stabWidget->setTabEnabled(PageCertificate,true) ;
 
-     loadInvitePage() ;
+	loadInvitePage() ;
 }
 
 void ConfCertDialog::loadInvitePage()
 {
-    RsPeerDetails detail;
+	RsPeerDetails detail;
 
-    if (!rsPeers->getPeerDetails(peerId, detail))
-    {
-        QMessageBox::information(this,
-                                 tr("RetroShare"),
-                                 tr("Error : cannot get peer details."));
-        close();
-        return;
-    }
+	if (!rsPeers->getPeerDetails(peerId, detail))
+	{
+		QMessageBox::information(this,
+		                         tr("RetroShare"),
+		                         tr("Error : cannot get peer details."));
+		close();
+		return;
+	}
 
-    ui._shouldAddSignatures_CB->setEnabled(detail.gpgSigners.size() > 1) ;
-
- //   std::string pgp_key = rsPeers->getPGPKey(detail.gpg_id,ui._shouldAddSignatures_CB_2->isChecked()) ; // this needs to be a SSL id
-
-//	ui.userCertificateText_2->setReadOnly(true);
-//	ui.userCertificateText_2->setMinimumHeight(200);
-//	ui.userCertificateText_2->setMinimumWidth(530);
-//	QFont font("Courier New",10,50,false);
-//	font.setStyleHint(QFont::TypeWriter,QFont::PreferMatch);
-//	font.setStyle(QFont::StyleNormal);
-//	ui.userCertificateText_2->setFont(font);
-//	ui.userCertificateText_2->setText(QString::fromUtf8(pgp_key.c_str()));
+	ui._shouldAddSignatures_CB->setEnabled(detail.gpgSigners.size() > 1) ;
 
 	std::string invite ;
-    RetroshareInviteFlags flags = RetroshareInviteFlags::DNS | RetroshareInviteFlags::CURRENT_IP | RetroshareInviteFlags::RADIX_FORMAT;
+	RetroshareInviteFlags flags = RetroshareInviteFlags::DNS | RetroshareInviteFlags::CURRENT_IP | RetroshareInviteFlags::RADIX_FORMAT;
 
-    if(!detail.isHiddenNode && ui._includeIPHistory_CB->isChecked())
-        flags |= RetroshareInviteFlags::FULL_IP_HISTORY;
+	if(!detail.isHiddenNode && ui._includeIPHistory_CB->isChecked())
+		flags |= RetroshareInviteFlags::FULL_IP_HISTORY;
 
-    if(ui._shortFormat_CB->isChecked())
+	if(ui._shortFormat_CB->isChecked())
 	{
-        rsPeers->getShortInvite(invite,detail.id,flags);
-        ui.stabWidget->setTabText(2, tr("Retroshare ID"));
+		rsPeers->getShortInvite(invite,detail.id,flags);
+		ui.stabWidget->setTabText(PageCertificate, tr("Retroshare ID"));
 	}
 	else
 	{
-        if(ui._shouldAddSignatures_CB->isChecked())
-            flags |= RetroshareInviteFlags::PGP_SIGNATURES;
+		if(ui._shouldAddSignatures_CB->isChecked())
+			flags |= RetroshareInviteFlags::PGP_SIGNATURES;
 
-        invite = rsPeers->GetRetroshareInvite(detail.id, flags ) ;
-		ui.stabWidget->setTabText(1, tr("Retroshare Certificate"));
+		invite = rsPeers->GetRetroshareInvite(detail.id, flags ) ;
+		ui.stabWidget->setTabText(PageCertificate, tr("Retroshare Certificate"));
 	}
 	
 	QString infotext = getCertificateDescription(detail,ui._shouldAddSignatures_CB->isChecked(),ui._shortFormat_CB->isChecked(), ui._includeIPHistory_CB->isChecked() );
 
-    ui.userCertificateText->setToolTip(infotext) ;
+	ui.userCertificateText->setToolTip(infotext) ;
 
-        ui.userCertificateText->setReadOnly(true);
-        ui.userCertificateText->setMinimumHeight(200);
-        ui.userCertificateText->setMinimumWidth(530);
-        QFont font("Courier New",10,50,false);
-        font.setStyleHint(QFont::TypeWriter,QFont::PreferMatch);
-        font.setStyle(QFont::StyleNormal);
-        ui.userCertificateText->setFont(font);
-        ui.userCertificateText->setText(QString::fromUtf8(invite.c_str()));
+	ui.userCertificateText->setReadOnly(true);
+	ui.userCertificateText->setMinimumHeight(200);
+	ui.userCertificateText->setMinimumWidth(530);
+	QFont font("Courier New",10,50,false);
+	font.setStyleHint(QFont::TypeWriter,QFont::PreferMatch);
+	font.setStyle(QFont::StyleNormal);
+	ui.userCertificateText->setFont(font);
+	ui.userCertificateText->setText(QString::fromUtf8(invite.c_str()));
 }
 
 QString ConfCertDialog::getCertificateDescription(const RsPeerDetails& detail,bool signatures_included,bool use_short_format,bool include_additional_locators)
diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.h b/retroshare-gui/src/gui/connect/ConfCertDialog.h
index 019e46598..a883dfd17 100644
--- a/retroshare-gui/src/gui/connect/ConfCertDialog.h
+++ b/retroshare-gui/src/gui/connect/ConfCertDialog.h
@@ -32,7 +32,8 @@ class ConfCertDialog : public QDialog
     Q_OBJECT
 
 public:
-    enum enumPage { PageDetails, PageTrust, PageCertificate };
+
+	enum enumPage { PageDetails = 0, PageTrust = 1, PageCertificate = 2 };
 
     template<class ID_CLASS> static void showIt(const ID_CLASS& id, enumPage page)
     {
@@ -40,13 +41,13 @@ public:
 
         switch (page) {
         case PageDetails:
-            confdialog->ui.stabWidget->setCurrentIndex(0);
+            confdialog->ui.stabWidget->setCurrentIndex(PageDetails);
             break;
         case PageTrust:
-            confdialog->ui.stabWidget->setCurrentIndex(1);
+            confdialog->ui.stabWidget->setCurrentIndex(PageTrust);
             break;
         case PageCertificate:
-            confdialog->ui.stabWidget->setCurrentIndex(2);
+            confdialog->ui.stabWidget->setCurrentIndex(PageCertificate);
             break;
         }
 
@@ -65,7 +66,7 @@ signals:
 
 private:
     /** Default constructor */
-    ConfCertDialog(const RsPeerId &id,const RsPgpId& pgp_id, QWidget *parent = 0, Qt::WindowFlags flags = 0);
+    ConfCertDialog(const RsPeerId &id,const RsPgpId& pgp_id, QWidget *parent = 0, Qt::WindowFlags flags = Qt::WindowFlags());
     /** Default destructor */
     ~ConfCertDialog();
 
@@ -88,6 +89,9 @@ private:
 
     QString nameAndLocation;
 
+	static QMap<RsPeerId, ConfCertDialog*> instances_ssl;
+	static QMap<RsPgpId,  ConfCertDialog*> instances_pgp;
+
     /** Qt Designer generated object */
     Ui::ConfCertDialog ui;
 };
diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.ui b/retroshare-gui/src/gui/connect/ConfCertDialog.ui
index 83b15ed92..a2f94bc5b 100644
--- a/retroshare-gui/src/gui/connect/ConfCertDialog.ui
+++ b/retroshare-gui/src/gui/connect/ConfCertDialog.ui
@@ -17,7 +17,7 @@
    <iconset resource="../images.qrc">
     <normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
   </property>
-  <layout class="QGridLayout" name="gridLayout_5">
+  <layout class="QGridLayout" name="ConfCertDialog_GL">
    <property name="leftMargin">
     <number>0</number>
    </property>
@@ -54,9 +54,9 @@
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QGridLayout" name="gridLayout_4">
+     <layout class="QGridLayout" name="frame_GL">
       <item row="1" column="0">
-       <layout class="QGridLayout" name="_12">
+       <layout class="QGridLayout" name="buttons_GL">
         <item row="0" column="0">
          <widget class="QDialogButtonBox" name="buttonBox">
           <property name="standardButtons">
@@ -77,7 +77,7 @@
         <property name="currentIndex">
          <number>0</number>
         </property>
-        <widget class="QWidget" name="tab">
+        <widget class="QWidget" name="detail_Tab">
          <attribute name="icon">
           <iconset resource="../images.qrc">
            <normaloff>:/images/info16.png</normaloff>:/images/info16.png</iconset>
@@ -85,15 +85,15 @@
          <attribute name="title">
           <string>Details</string>
          </attribute>
-         <layout class="QVBoxLayout" name="verticalLayout_3">
+         <layout class="QVBoxLayout" name="detail_Tab_VL">
           <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_2">
+           <layout class="QHBoxLayout" name="detail_Tab_Top_HL">
             <item>
-             <widget class="QGroupBox" name="groupBox_4">
+             <widget class="QGroupBox" name="detail_GBox">
               <property name="title">
                <string>Node info:</string>
               </property>
-              <layout class="QGridLayout" name="gridLayout_3">
+              <layout class="QGridLayout" name="detail_Tab_Left_GL">
                <item row="3" column="1">
                 <widget class="QLineEdit" name="statusline">
                  <property name="readOnly">
@@ -184,7 +184,7 @@
                 </widget>
                </item>
                <item row="4" column="0">
-                <widget class="QLabel" name="crypto_label">
+                <widget class="QLabel" name="label_crypto">
                  <property name="text">
                   <string>Encryption</string>
                  </property>
@@ -211,7 +211,7 @@
                 <widget class="QLineEdit" name="statusmessage"/>
                </item>
                <item row="7" column="0">
-                <widget class="QLabel" name="label_2">
+                <widget class="QLabel" name="label_status_message">
                  <property name="text">
                   <string>Status message:</string>
                  </property>
@@ -221,7 +221,7 @@
              </widget>
             </item>
             <item>
-             <layout class="QVBoxLayout" name="verticalLayout_2">
+             <layout class="QVBoxLayout" name="detail_Tab_Right_VL">
               <item>
                <widget class="AvatarWidget" name="avatar">
                 <property name="minimumSize">
@@ -239,7 +239,7 @@
                </widget>
               </item>
               <item>
-               <spacer name="verticalSpacer_5">
+               <spacer name="detail_Tab_Right_VL_Spacer">
                 <property name="orientation">
                  <enum>Qt::Vertical</enum>
                 </property>
@@ -256,7 +256,7 @@
            </layout>
           </item>
           <item>
-           <spacer name="verticalSpacer">
+           <spacer name="detail_Tab_VSpacer">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
@@ -270,19 +270,19 @@
           </item>
          </layout>
         </widget>
-        <widget class="QWidget" name="tab_2">
+        <widget class="QWidget" name="connectivity_Tab">
          <attribute name="title">
           <string>Connectivity</string>
          </attribute>
-         <layout class="QVBoxLayout" name="verticalLayout_6">
+         <layout class="QVBoxLayout" name="connectivity_Tab_VL">
           <item>
-           <widget class="QGroupBox" name="groupBox">
+           <widget class="QGroupBox" name="currentAdd_GBox">
             <property name="title">
              <string>Current address:</string>
             </property>
-            <layout class="QVBoxLayout" name="verticalLayout_4">
+            <layout class="QVBoxLayout" name="currentAdd_GBox_VL">
              <item>
-              <layout class="QGridLayout" name="gridLayout_12">
+              <layout class="QGridLayout" name="currentAdd_GL">
                <item row="1" column="3">
                 <widget class="QSpinBox" name="localPort">
                  <property name="minimum">
@@ -365,11 +365,11 @@
            </widget>
           </item>
           <item>
-           <widget class="QGroupBox" name="groupBox_2">
+           <widget class="QGroupBox" name="knownAdd_GBox">
             <property name="title">
              <string>List of known addresses:</string>
             </property>
-            <layout class="QVBoxLayout" name="verticalLayout_5">
+            <layout class="QVBoxLayout" name="knownAdd_GBox_VL">
              <item>
               <widget class="QListWidget" name="ipAddressList">
                <property name="contextMenuPolicy">
@@ -385,16 +385,16 @@
           </item>
          </layout>
         </widget>
-        <widget class="QWidget" name="tab_4">
+        <widget class="QWidget" name="rs_cert_Tab">
          <attribute name="title">
           <string>Retroshare Certificate</string>
          </attribute>
-         <layout class="QVBoxLayout" name="verticalLayout">
+         <layout class="QVBoxLayout" name="rs_cert_Tab_VL">
           <item>
            <widget class="QTextEdit" name="userCertificateText"/>
           </item>
           <item>
-           <layout class="QHBoxLayout" name="horizontalLayout">
+           <layout class="QHBoxLayout" name="rs_cert_CB_HL">
             <item>
              <widget class="QCheckBox" name="_shouldAddSignatures_CB">
               <property name="text">
@@ -417,7 +417,7 @@
              </widget>
             </item>
             <item>
-             <spacer name="horizontalSpacer_2">
+             <spacer name="rs_cert_CB_HL_HSpacer">
               <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
diff --git a/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp b/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp
index d1cf736a6..b167ca1ed 100644
--- a/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp
+++ b/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp
@@ -45,7 +45,7 @@
 #include "util/DateTime.h"
 #include "util/misc.h"
 
-static QMap<RsPgpId, PGPKeyDialog*> instances_pgp;
+QMap<RsPgpId, PGPKeyDialog*> PGPKeyDialog::instances_pgp;
 
 PGPKeyDialog *PGPKeyDialog::instance(const RsPgpId& pgp_id)
 {
@@ -148,9 +148,6 @@ void PGPKeyDialog::load()
     ui.name->setText(QString::fromUtf8(detail.name.c_str()));
     ui.pgpfingerprint->setText(misc::fingerPrintStyleSplit(QString::fromStdString(detail.fpr.toStdString())));
 
-    ui.pgpfingerprint->show();
-    ui.pgpfingerprint_label->show();
-
     ui._direct_transfer_CB->setChecked(  detail.service_perm_flags & RS_NODE_PERM_DIRECT_DL ) ;
 	//Add warning to direct source checkbox depends general setting.
 	switch (rsFiles->filePermDirectDL())
@@ -183,7 +180,7 @@ void PGPKeyDialog::load()
         ui.signKeyButton->hide();
         ui.denyFriendButton->hide();
 
-        ui.web_of_trust_label->hide();
+        ui.label_trustlevel->hide();
         ui.trustlevel_CB->hide();
 
         ui.is_signing_me->hide();
@@ -192,7 +189,7 @@ void PGPKeyDialog::load()
     }
     else
     {
-        ui.web_of_trust_label->show();
+        ui.label_trustlevel->show();
         ui.trustlevel_CB->show();
         ui.is_signing_me->show();
         ui.signersLabel->setText(tr("This key is signed by :")+" ");
@@ -279,14 +276,14 @@ void PGPKeyDialog::loadKeyPage()
 
      std::string pgp_key = rsPeers->getPGPKey(detail.gpg_id,ui._shouldAddSignatures_CB_2->isChecked()) ; // this needs to be a SSL id
 
-    ui.userCertificateText_2->setReadOnly(true);
-    ui.userCertificateText_2->setMinimumHeight(200);
-    ui.userCertificateText_2->setMinimumWidth(530);
+    ui.userCertificateText->setReadOnly(true);
+    ui.userCertificateText->setMinimumHeight(200);
+    ui.userCertificateText->setMinimumWidth(530);
     QFont font("Courier New",10,50,false);
     font.setStyleHint(QFont::TypeWriter,QFont::PreferMatch);
     font.setStyle(QFont::StyleNormal);
-    ui.userCertificateText_2->setFont(font);
-    ui.userCertificateText_2->setText(QString::fromUtf8(pgp_key.c_str()));
+    ui.userCertificateText->setFont(font);
+    ui.userCertificateText->setText(QString::fromUtf8(pgp_key.c_str()));
 
     QString helptext ;
     helptext += tr("<p>This PGP key (ID=")+detail.gpg_id.toStdString().c_str()+")" + " authenticates one or more retroshare nodes.</p> ";
@@ -299,7 +296,7 @@ void PGPKeyDialog::loadKeyPage()
 
     helptext += "</p>" ;
 
-    ui.userCertificateText_2->setToolTip(helptext) ;
+    ui.userCertificateText->setToolTip(helptext) ;
 }
 
 void PGPKeyDialog::applyDialog()
diff --git a/retroshare-gui/src/gui/connect/PGPKeyDialog.h b/retroshare-gui/src/gui/connect/PGPKeyDialog.h
index ed414960c..8ca79f2bf 100644
--- a/retroshare-gui/src/gui/connect/PGPKeyDialog.h
+++ b/retroshare-gui/src/gui/connect/PGPKeyDialog.h
@@ -30,7 +30,7 @@ class PGPKeyDialog : public QDialog
     Q_OBJECT
 
 public:
-    enum enumPage { PageDetails=0x0 };
+	enum enumPage { PageDetails = 0, PageKey = 1, PageOption = 2};
 
     template<class ID_CLASS> static void showIt(const ID_CLASS& id, enumPage page)
     {
@@ -38,7 +38,13 @@ public:
 
         switch (page) {
         case PageDetails:
-            confdialog->ui.stabWidget->setCurrentIndex(0);
+            confdialog->ui.stabWidget->setCurrentIndex(PageDetails);
+            break;
+        case PageKey:
+            confdialog->ui.stabWidget->setCurrentIndex(PageKey);
+            break;
+        case PageOption:
+            confdialog->ui.stabWidget->setCurrentIndex(PageOption);
             break;
         }
 
@@ -56,7 +62,7 @@ signals:
 
 private:
     /** Default constructor */
-    PGPKeyDialog(const RsPeerId &id,const RsPgpId& pgp_id, QWidget *parent = 0, Qt::WindowFlags flags = 0);
+    PGPKeyDialog(const RsPeerId &id,const RsPgpId& pgp_id, QWidget *parent = 0, Qt::WindowFlags flags = Qt::WindowFlags());
     /** Default destructor */
     ~PGPKeyDialog();
 
@@ -80,6 +86,8 @@ private:
     RsPeerId peerId;
     RsPgpId  pgpId;
 
+	static QMap<RsPgpId, PGPKeyDialog*> instances_pgp;
+
     /** Qt Designer generated object */
     Ui::PGPKeyDialog ui;
 };
diff --git a/retroshare-gui/src/gui/connect/PGPKeyDialog.ui b/retroshare-gui/src/gui/connect/PGPKeyDialog.ui
index 4baa2f667..04b891fdf 100644
--- a/retroshare-gui/src/gui/connect/PGPKeyDialog.ui
+++ b/retroshare-gui/src/gui/connect/PGPKeyDialog.ui
@@ -13,7 +13,7 @@
   <property name="windowTitle">
    <string>Retroshare profile</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout_4">
+  <layout class="QGridLayout" name="PGPKeyDialog_GL">
    <property name="leftMargin">
     <number>0</number>
    </property>
@@ -37,7 +37,7 @@
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QGridLayout" name="gridLayout_3">
+     <layout class="QGridLayout" name="frame_GL">
       <property name="topMargin">
        <number>3</number>
       </property>
@@ -56,11 +56,11 @@
         <property name="currentIndex">
          <number>0</number>
         </property>
-        <widget class="QWidget" name="tab">
+        <widget class="QWidget" name="info_Tab">
          <attribute name="title">
           <string>Profile info</string>
          </attribute>
-         <layout class="QGridLayout" name="gridLayout_2">
+         <layout class="QGridLayout" name="info_Tab_GL">
           <property name="bottomMargin">
            <number>0</number>
           </property>
@@ -68,9 +68,9 @@
            <number>6</number>
           </property>
           <item row="0" column="0">
-           <layout class="QHBoxLayout" name="horizontalLayout_2">
+           <layout class="QHBoxLayout" name="info_Top_HL">
             <item>
-             <layout class="QGridLayout" name="gridLayout">
+             <layout class="QGridLayout" name="info_Top_GL">
               <item row="0" column="1">
                <widget class="QLineEdit" name="name">
                 <property name="readOnly">
@@ -89,7 +89,7 @@
                </widget>
               </item>
               <item row="1" column="0">
-               <widget class="QLabel" name="pgpfingerprint_label">
+               <widget class="QLabel" name="label_pgpfingerprint">
                 <property name="text">
                  <string>Fingerprint :</string>
                 </property>
@@ -164,7 +164,7 @@
                </widget>
               </item>
               <item row="2" column="0">
-               <widget class="QLabel" name="web_of_trust_label">
+               <widget class="QLabel" name="label_trustlevel">
                 <property name="text">
                  <string>Trust level:</string>
                 </property>
@@ -174,14 +174,14 @@
                </widget>
               </item>
               <item row="3" column="0">
-               <widget class="QLabel" name="label_5">
+               <widget class="QLabel" name="label_signKey">
                 <property name="text">
                  <string>Keysigning:</string>
                 </property>
                </widget>
               </item>
               <item row="3" column="1">
-               <layout class="QHBoxLayout" name="horizontalLayout_4">
+               <layout class="QHBoxLayout" name="signKey_HL">
                 <item>
                  <widget class="QToolButton" name="signKeyButton">
                   <property name="toolTip">
@@ -206,7 +206,7 @@ p, li { white-space: pre-wrap; }
                  </widget>
                 </item>
                 <item>
-                 <spacer name="horizontalSpacer_2">
+                 <spacer name="signKey_HSpacer">
                   <property name="orientation">
                    <enum>Qt::Horizontal</enum>
                   </property>
@@ -239,7 +239,7 @@ p, li { white-space: pre-wrap; }
              <number>6</number>
             </property>
             <item>
-             <spacer name="horizontalSpacer">
+             <spacer name="friendAndSign_HSpacer">
               <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
@@ -312,7 +312,7 @@ p, li { white-space: pre-wrap; }
            </layout>
           </item>
           <item row="2" column="0">
-           <layout class="QVBoxLayout" name="verticalLayout">
+           <layout class="QVBoxLayout" name="signer_VL">
             <item>
              <widget class="QLabel" name="signersLabel">
               <property name="text">
@@ -350,13 +350,13 @@ p, li { white-space: pre-wrap; }
           </item>
          </layout>
         </widget>
-        <widget class="QWidget" name="widget">
+        <widget class="QWidget" name="key_Tab">
          <attribute name="title">
           <string>PGP key</string>
          </attribute>
-         <layout class="QVBoxLayout" name="verticalLayout_3">
+         <layout class="QVBoxLayout" name="key_Tab_VL">
           <item>
-           <widget class="QLabel" name="label_4">
+           <widget class="QLabel" name="label_userCert">
             <property name="text">
              <string>Below is the node's profile key in PGP ASCII format. It identifies all nodes of the same profile. A &quot;Retroshare certificate&quot; that you can exchange in order to make friends, is in the the &quot;details&quot; of each separate node.</string>
             </property>
@@ -366,7 +366,7 @@ p, li { white-space: pre-wrap; }
            </widget>
           </item>
           <item>
-           <widget class="QTextEdit" name="userCertificateText_2">
+           <widget class="QTextEdit" name="userCertificateText">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
               <horstretch>0</horstretch>
@@ -376,7 +376,7 @@ p, li { white-space: pre-wrap; }
            </widget>
           </item>
           <item>
-           <layout class="QHBoxLayout" name="horizontalLayout">
+           <layout class="QHBoxLayout" name="key_HL">
             <item>
              <widget class="QCheckBox" name="_shouldAddSignatures_CB_2">
               <property name="toolTip">
@@ -391,13 +391,13 @@ p, li { white-space: pre-wrap; }
           </item>
          </layout>
         </widget>
-        <widget class="QWidget" name="tab_2">
+        <widget class="QWidget" name="option_Tab">
          <attribute name="title">
           <string>Options</string>
          </attribute>
-         <layout class="QVBoxLayout" name="verticalLayout_6">
+         <layout class="QVBoxLayout" name="option_Tab_VL">
           <item>
-           <widget class="QLabel" name="label_3">
+           <widget class="QLabel" name="label_option_Tab">
             <property name="text">
              <string>These options apply to all nodes of the profile:</string>
             </property>
@@ -434,11 +434,11 @@ p, li { white-space: pre-wrap; }
            </widget>
           </item>
           <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_3">
+           <layout class="QHBoxLayout" name="option_Speed_HL">
             <item>
-             <layout class="QVBoxLayout" name="verticalLayout_5">
+             <layout class="QVBoxLayout" name="option_Speed_Left_VL">
               <item>
-               <widget class="QLabel" name="label">
+               <widget class="QLabel" name="label_maxUploadSpeed">
                 <property name="text">
                  <string>Max upload speed (0=unlimited)</string>
                 </property>
@@ -448,7 +448,7 @@ p, li { white-space: pre-wrap; }
                </widget>
               </item>
               <item>
-               <widget class="QLabel" name="label_2">
+               <widget class="QLabel" name="label_maxDownloadSpeed">
                 <property name="text">
                  <string>Max download speed (0=unlimited)</string>
                 </property>
@@ -460,7 +460,7 @@ p, li { white-space: pre-wrap; }
              </layout>
             </item>
             <item>
-             <layout class="QVBoxLayout" name="verticalLayout_4">
+             <layout class="QVBoxLayout" name="option_Speed_Right_VL">
               <item>
                <widget class="QSpinBox" name="maxUploadSpeed_SB">
                 <property name="suffix">
@@ -486,7 +486,7 @@ p, li { white-space: pre-wrap; }
            </layout>
           </item>
           <item>
-           <spacer name="verticalSpacer_4">
+           <spacer name="option_Tab_VSpacer">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
@@ -518,17 +518,17 @@ p, li { white-space: pre-wrap; }
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>RSTextBrowser</class>
+   <extends>QTextBrowser</extends>
+   <header>gui/common/RSTextBrowser.h</header>
+  </customwidget>
   <customwidget>
    <class>HeaderFrame</class>
    <extends>QFrame</extends>
    <header>gui/common/HeaderFrame.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>RSTextBrowser</class>
-   <extends>QTextBrowser</extends>
-   <header>gui/common/RSTextBrowser.h</header>
-  </customwidget>
  </customwidgets>
  <resources>
   <include location="../images.qrc"/>