diff --git a/src/js/controller/account.js b/src/js/controller/account.js
index 0457db1..0c456fb 100644
--- a/src/js/controller/account.js
+++ b/src/js/controller/account.js
@@ -15,12 +15,12 @@ define(function(require) {
         //
         // scope variables
         //
-        
+
         var fpr = emailDao._crypto.getFingerprint(),
             keyId = emailDao._crypto.getKeyId();
         $scope.eMail = emailDao._account.emailAddress;
-        $scope.keyId = keyId.slice(0,4) + ' ' + keyId.slice(4,8) + ' ' + keyId.slice(8,12) + ' ' + keyId.slice(12);
-        $scope.fingerprint = fpr.slice(0,4) + ' ' + fpr.slice(4,8) + ' ' + fpr.slice(8,12) + ' ' + fpr.slice(12,16) + ' ' + fpr.slice(16,20) + ' ' + fpr.slice(20,24) + ' ' + fpr.slice(24,28) + ' ' + fpr.slice(28,32) + ' ' + fpr.slice(32,36) + ' ' + fpr.slice(36);
+        $scope.keyId = keyId.slice(8);
+        $scope.fingerprint = fpr.slice(0, 4) + ' ' + fpr.slice(4, 8) + ' ' + fpr.slice(8, 12) + ' ' + fpr.slice(12, 16) + ' ' + fpr.slice(16, 20) + ' ' + fpr.slice(20, 24) + ' ' + fpr.slice(24, 28) + ' ' + fpr.slice(28, 32) + ' ' + fpr.slice(32, 36) + ' ' + fpr.slice(36);
         $scope.keysize = emailDao._account.asymKeySize;
 
         //
diff --git a/src/sass/views/_account.scss b/src/sass/views/_account.scss
index 42704f0..17b115f 100644
--- a/src/sass/views/_account.scss
+++ b/src/sass/views/_account.scss
@@ -22,6 +22,9 @@
 
     button {
         border: 0!important;
+    }
+
+    .export-control {
         position: absolute;
         bottom: 15px;
         right: 15px;
diff --git a/src/tpl/account.html b/src/tpl/account.html
index 1ed38ff..9deacaf 100644
--- a/src/tpl/account.html
+++ b/src/tpl/account.html
@@ -6,27 +6,29 @@
 
   <div class="content">
     <div class="view-account">
-        <table summary="Kontakt">
-            <tbody>
-                <tr>
-                    <td>Account</td>
-                    <td>{{eMail}}</td>
-                </tr>
-                <tr>
-                    <td>PGP Key ID</td>
-                    <td>{{keyId}}</td>
-                </tr>
-                <tr>
-                    <td>PGP Key Fingerprint</td>
-                    <td><span>{{fingerprint}}</span></td>
-                </tr>
-                <tr>
-                    <td>PGP Key Size</td>
-                    <td>{{keysize}} bit</td>
-                </tr>
-            </tbody>
-        </table>
+      <table summary="Kontakt">
+        <tbody>
+          <tr>
+            <td>Email</td>
+            <td>{{eMail}}</td>
+          </tr>
+          <tr>
+            <td>PGP Key ID</td>
+            <td>{{keyId}}</td>
+          </tr>
+          <tr>
+            <td>PGP Fingerprint</td>
+            <td><span>{{fingerprint}}</span></td>
+          </tr>
+          <tr>
+            <td>Key Size (RSA)</td>
+            <td>{{keysize}} bit</td>
+          </tr>
+        </tbody>
+      </table>
+      <div class="export-control">
         <button ng-click="exportKeyFile()" class="btn">Export keypair</button>
+      </div>
     </div><!-- /.view-account -->
   </div><!-- /.content -->
 </div><!-- /.lightbox-body -->
\ No newline at end of file