diff --git a/bookmarklet.js b/bookmarklet.js
index eb36dc9..b7b201f 100644
--- a/bookmarklet.js
+++ b/bookmarklet.js
@@ -685,9 +685,13 @@
             }));
           }
 
-          // edvidan
+          // ETH edvidan
           if(data.fields.externalIssueId) {
-            issueData.externalIssueId = data.fields.externalIssueId;
+            if(/^[0-9]{4,}$/.test(data.fields.externalIssueId)) {
+              issueData.externalIssueId = "Bug " + data.fields.externalIssueId;
+            } else {
+              issueData.externalIssueId = data.fields.externalIssueId;
+            }
           }
 
           issueData.url = module.baseUrl() + "/browse/" + issueData.key;
@@ -1200,8 +1204,8 @@
        <div class="card-content">
          <div class="card-body shadow">
            <div class="issue-summary"></div>
-           <div class="issue-external-id"></div>
            <div class="issue-description"></div>
+           <div class="issue-external-id"></div>
          </div>
          <div class="card-header">
            <div class="author">
@@ -1294,6 +1298,7 @@
        font-size: 0.8rem;
        overflow: visible;
        line-height: 0.38rem;
+       display: none;
      }
      .author > span:nth-of-type(2) {
        position: relative;
@@ -1360,6 +1365,14 @@
        font-weight: bold;
        font-size: 0.9rem;
      }
+     .issue-external-id {
+       font-weight: bold;
+       font-size: 2.5rem;
+       display: block;
+       position: absolute;
+       bottom: 0.5rem;
+       left: 2.8rem;
+     }
      .issue-description {
        margin-top: 0.1rem;
        display: block;
@@ -1375,16 +1388,16 @@
      }
      .issue-id {
        position: absolute;
-       left: 1rem;
+       left: 2rem;
        top: 1.2rem;
        height: 1.5rem;
-       max-width: calc(100% - 7.5rem);
+       max-width: calc(100% - 5.5rem);
        min-width: 6.0rem;
        padding-left: 2.1rem;
        padding-right: 0.4rem;
        background-color: WHITESMOKE;
        line-height: 1.3rem;
-       font-size: 0.8rem;
+       font-size: 1.2rem;
        font-weight: bold;
        text-align: center;
        white-space: nowrap;