diff --git a/tools/walletextension/api/staticOG/index.html b/tools/walletextension/api/staticOG/index.html
index cc506c17b1..6b783391bd 100644
--- a/tools/walletextension/api/staticOG/index.html
+++ b/tools/walletextension/api/staticOG/index.html
@@ -15,8 +15,8 @@
 <h2>◠. Obscuro Gateway Demo! ◠.</h2>
 
 
-<button class="btn btn-primary btn-lg btn-block mb-3" id="join">Join</button>
-<button class="btn btn-primary btn-lg btn-block mb-3" id="revokeUserID">Revoke UserID</button>
+<button class="btn btn-primary btn-lg btn-block mb-3" id="join" style="display: none">Join</button>
+<button class="btn btn-primary btn-lg btn-block mb-3" id="revokeUserID" style="display: none">Revoke UserID</button>
 <p id="status"></p>
 <table id="accountsTable" border="1">
     <thead>
diff --git a/tools/walletextension/api/staticOG/javascript.js b/tools/walletextension/api/staticOG/javascript.js
index 3dfb6adda1..baabe5541b 100644
--- a/tools/walletextension/api/staticOG/javascript.js
+++ b/tools/walletextension/api/staticOG/javascript.js
@@ -1,8 +1,6 @@
 const eventClick = "click";
 const eventDomLoaded = "DOMContentLoaded";
 const idJoin = "join";
-const idAddAccount = "addAccount";
-const idAddAllAccounts = "addAllAccounts";
 const idRevokeUserID = "revokeUserID";
 const idStatus = "status";
 const idAccountsTable = "accountsTable";
@@ -207,12 +205,9 @@ function checkIfMetamaskIsLoaded() {
     if (window.ethereum) {
         handleEthereum();
     } else {
-        // TODO: Refactor and change the way we hide and display items on our webpage
-        document.getElementById(idJoin).style.display = "none";
-        document.getElementById(idAddAccount).style.display = "none";
-        document.getElementById(idAddAllAccounts).style.display = "none";
-        document.getElementById(idRevokeUserID).style.display = "none";
         const statusArea = document.getElementById(idStatus);
+        const table = document.getElementById("accountsTable");
+        table.style.display = "none";
         statusArea.innerText = 'Connecting to Metamask...';
         window.addEventListener('ethereum#initialized', handleEthereum, {
             once: true,