diff --git a/swisssurfer/src/certificate.hxx b/swisssurfer/src/certificate.hxx
index 2128d75..5666e2c 100644
--- a/swisssurfer/src/certificate.hxx
+++ b/swisssurfer/src/certificate.hxx
@@ -14,9 +14,9 @@
 #include <QtGui/QTreeWidgetItem>
 #include <QtNetwork/QSslCertificate>
 
-class Certificate: public QTreeWidget, protected Ui::Certificate {
+class Certificate: public QWidget, protected Ui::Certificate {
   public:
-    Certificate(QWidget* p): QTreeWidget(p) {
+    Certificate(QWidget* p): QWidget(p) {
       setupUi(this);
     }
     Certificate& certificate(const QSslCertificate& cert) {
diff --git a/swisssurfer/src/pinentry.ui b/swisssurfer/src/pinentry.ui
index c6c27e9..6aafca4 100644
--- a/swisssurfer/src/pinentry.ui
+++ b/swisssurfer/src/pinentry.ui
@@ -31,8 +31,8 @@
     </widget>
    </item>
    <item>
-    <layout class="QFormLayout" name="formLayout_2">
-     <item row="0" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
       <widget class="QLabel" name="label_2">
        <property name="text">
         <string>PIN:</string>
@@ -42,13 +42,95 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="1">
+     <item>
       <widget class="QLineEdit" name="_pin">
        <property name="echoMode">
         <enum>QLineEdit::Password</enum>
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QStackedWidget" name="_pinstatus">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="currentIndex">
+        <number>1</number>
+       </property>
+       <widget class="QWidget" name="page">
+        <layout class="QGridLayout" name="gridLayout">
+         <item row="0" column="0">
+          <widget class="QLabel" name="_status">
+           <property name="text">
+            <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:'DejaVu Serif'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:24pt; color:#00b900;&quot;&gt;✔&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QLabel" name="_retries">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>%1 PIN attempts left</string>
+           </property>
+           <property name="wordWrap">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+       <widget class="QWidget" name="page_2">
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <item>
+          <widget class="QLabel" name="_status_2">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <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:'DejaVu Serif'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'sans-serif'; font-size:24pt; color:#ff0000;&quot;&gt;✘&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="_tries_2">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>bad or locked certificate</string>
+           </property>
+           <property name="wordWrap">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+       <widget class="QWidget" name="page_3"/>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>
@@ -61,88 +143,6 @@
      </property>
     </widget>
    </item>
-   <item>
-    <widget class="QStackedWidget" name="_pinstatus">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="currentIndex">
-      <number>1</number>
-     </property>
-     <widget class="QWidget" name="page">
-      <layout class="QGridLayout" name="gridLayout">
-       <item row="0" column="0">
-        <widget class="QLabel" name="_status">
-         <property name="text">
-          <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:'DejaVu Serif'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:24pt; color:#00b900;&quot;&gt;✔&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
-        <widget class="QLabel" name="_retries">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>there are %1 PIN attempts left</string>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="page_2">
-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <item>
-        <widget class="QLabel" name="_status_2">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <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:'DejaVu Serif'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'sans-serif'; font-size:24pt; color:#ff0000;&quot;&gt;✘&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="_tries_2">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>certificate is bad or locked</string>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="page_3"/>
-    </widget>
-   </item>
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
diff --git a/swisssurfer/src/swisssurfer_de.ts b/swisssurfer/src/swisssurfer_de.ts
index a89353a..917cb42 100644
--- a/swisssurfer/src/swisssurfer_de.ts
+++ b/swisssurfer/src/swisssurfer_de.ts
@@ -213,11 +213,6 @@
         <source>&amp;Proxy ...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="browser.ui" line="326"/>
-        <source>Auto Zoom</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="browser.ui" line="143"/>
         <location filename="browser.ui" line="279"/>
@@ -648,13 +643,22 @@ Compiled: qt-%5</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pinentry.ui" line="97"/>
+        <location filename="pinentry.ui" line="85"/>
+        <source>%1 PIN attempts left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="pinentry.ui" line="122"/>
+        <source>bad or locked certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="pinentry.hxx" line="27"/>
         <source>there are %1 PIN attempts left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pinentry.ui" line="117"/>
+        <location filename="pinentry.ui" line="105"/>
         <source>&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; }
@@ -663,12 +667,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pinentry.ui" line="134"/>
-        <source>certificate is bad or locked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="pinentry.ui" line="80"/>
+        <location filename="pinentry.ui" line="68"/>
         <source>&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; }
diff --git a/swisssurfer/src/swisssurfer_en.ts b/swisssurfer/src/swisssurfer_en.ts
index a0f5dc4..70608f3 100644
--- a/swisssurfer/src/swisssurfer_en.ts
+++ b/swisssurfer/src/swisssurfer_en.ts
@@ -243,11 +243,6 @@
         <source>&amp;Proxy ...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="browser.ui" line="326"/>
-        <source>Auto Zoom</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="browser.hxx" line="442"/>
         <source>Checking: %1</source>
@@ -633,7 +628,7 @@ Compiled: qt-%5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pinentry.ui" line="80"/>
+        <location filename="pinentry.ui" line="68"/>
         <source>&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; }
@@ -642,13 +637,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pinentry.ui" line="97"/>
+        <location filename="pinentry.ui" line="85"/>
+        <source>%1 PIN attempts left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="pinentry.ui" line="122"/>
+        <source>bad or locked certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="pinentry.hxx" line="27"/>
         <source>there are %1 PIN attempts left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pinentry.ui" line="117"/>
+        <location filename="pinentry.ui" line="105"/>
         <source>&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; }
@@ -656,11 +660,6 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;sans-serif&apos;; font-size:24pt; color:#ff0000;&quot;&gt;✘&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="pinentry.ui" line="134"/>
-        <source>certificate is bad or locked</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QMessageBox</name>
diff --git a/swisssurfer/src/swisssurfer_fr.ts b/swisssurfer/src/swisssurfer_fr.ts
index a89353a..917cb42 100644
--- a/swisssurfer/src/swisssurfer_fr.ts
+++ b/swisssurfer/src/swisssurfer_fr.ts
@@ -213,11 +213,6 @@
         <source>&amp;Proxy ...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="browser.ui" line="326"/>
-        <source>Auto Zoom</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="browser.ui" line="143"/>
         <location filename="browser.ui" line="279"/>
@@ -648,13 +643,22 @@ Compiled: qt-%5</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pinentry.ui" line="97"/>
+        <location filename="pinentry.ui" line="85"/>
+        <source>%1 PIN attempts left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="pinentry.ui" line="122"/>
+        <source>bad or locked certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="pinentry.hxx" line="27"/>
         <source>there are %1 PIN attempts left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pinentry.ui" line="117"/>
+        <location filename="pinentry.ui" line="105"/>
         <source>&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; }
@@ -663,12 +667,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pinentry.ui" line="134"/>
-        <source>certificate is bad or locked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="pinentry.ui" line="80"/>
+        <location filename="pinentry.ui" line="68"/>
         <source>&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; }
diff --git a/swisssurfer/src/swisssurfer_it.ts b/swisssurfer/src/swisssurfer_it.ts
index a89353a..917cb42 100644
--- a/swisssurfer/src/swisssurfer_it.ts
+++ b/swisssurfer/src/swisssurfer_it.ts
@@ -213,11 +213,6 @@
         <source>&amp;Proxy ...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="browser.ui" line="326"/>
-        <source>Auto Zoom</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="browser.ui" line="143"/>
         <location filename="browser.ui" line="279"/>
@@ -648,13 +643,22 @@ Compiled: qt-%5</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pinentry.ui" line="97"/>
+        <location filename="pinentry.ui" line="85"/>
+        <source>%1 PIN attempts left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="pinentry.ui" line="122"/>
+        <source>bad or locked certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="pinentry.hxx" line="27"/>
         <source>there are %1 PIN attempts left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pinentry.ui" line="117"/>
+        <location filename="pinentry.ui" line="105"/>
         <source>&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; }
@@ -663,12 +667,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pinentry.ui" line="134"/>
-        <source>certificate is bad or locked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="pinentry.ui" line="80"/>
+        <location filename="pinentry.ui" line="68"/>
         <source>&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; }