diff --git a/apps/taquito-test-dapp/src/Layout.svelte b/apps/taquito-test-dapp/src/Layout.svelte
index ce28feb1ea..2a469d51fd 100644
--- a/apps/taquito-test-dapp/src/Layout.svelte
+++ b/apps/taquito-test-dapp/src/Layout.svelte
@@ -25,18 +25,23 @@
     }
   }
   .events-container {
+    border: 1px solid navy;
+    margin: 3px;
+    padding: 3px;
     grid-column: 1 / 3;
-    height: calc(25vh);
-    ul {
-      overflow-y: scroll;
-      background-color: skyblue;
-      height: 100%;
-    }
+    display: flex;
+    flex-direction: column;
+
     > span {
       color: white;
       font-weight: bold;
       font-size: larger;
     }
+    ul {
+      overflow-y: scroll;
+      flex-grow: 1; 
+      background-color: skyblue;
+    }
   }
 </style>
 
@@ -49,7 +54,7 @@
   <Sidebar bind:this={side}/>
   <slot />
   <div class="events-container">
-    <span>Events ({$store.eventLogs.length}):</span> <button on:click={store.clearEvents} style="display: inline;">clear</button>
+    <span>Events ({$store.eventLogs.length}): <button on:click={store.clearEvents} style="display: inline;">clear</button></span>
     <ul>
       {#each $store.eventLogs as event}
         <li>
diff --git a/apps/taquito-test-dapp/src/lib/Sidebar.svelte b/apps/taquito-test-dapp/src/lib/Sidebar.svelte
index 4ddd82a782..705d564b13 100644
--- a/apps/taquito-test-dapp/src/lib/Sidebar.svelte
+++ b/apps/taquito-test-dapp/src/lib/Sidebar.svelte
@@ -21,7 +21,7 @@
 <style lang="scss">
   section {
     padding: 10px;
-    height: calc(60vh - 20px);
+    height: 100%;
     color: white;
     display: grid;
     grid-template-rows: 8% 5% 87%;
diff --git a/apps/taquito-test-dapp/src/lib/Wallet.svelte b/apps/taquito-test-dapp/src/lib/Wallet.svelte
index e88f9f2030..148902d4f6 100644
--- a/apps/taquito-test-dapp/src/lib/Wallet.svelte
+++ b/apps/taquito-test-dapp/src/lib/Wallet.svelte
@@ -152,7 +152,13 @@ function subscribeToAllEvents(wallet: BeaconWallet) {
   wallet.client.subscribeToEvent(BeaconEvent.ACKNOWLEDGE_RECEIVED, (data) => saveLog(data, BeaconEvent.ACKNOWLEDGE_RECEIVED));
   wallet.client.subscribeToEvent(BeaconEvent.LOCAL_RATE_LIMIT_REACHED, (data) => saveLog(data, BeaconEvent.LOCAL_RATE_LIMIT_REACHED));
   wallet.client.subscribeToEvent(BeaconEvent.NO_PERMISSIONS, (data) => saveLog(data, BeaconEvent.NO_PERMISSIONS));
-  wallet.client.subscribeToEvent(BeaconEvent.ACTIVE_ACCOUNT_SET, (data) => saveLog(data, BeaconEvent.ACTIVE_ACCOUNT_SET));
+
+  wallet.client.subscribeToEvent(BeaconEvent.ACTIVE_ACCOUNT_SET, (data) => {
+    saveLog(data, BeaconEvent.ACTIVE_ACCOUNT_SET)
+    store.updateUserAddress(data.address);
+    store.updateNetworkType(data.network.type as SupportedNetworks);
+  });
+
   wallet.client.subscribeToEvent(BeaconEvent.ACTIVE_TRANSPORT_SET, (data) => saveLog(data, BeaconEvent.ACTIVE_TRANSPORT_SET));
   wallet.client.subscribeToEvent(BeaconEvent.SHOW_PREPARE, (data) => saveLog(data, BeaconEvent.SHOW_PREPARE));
   wallet.client.subscribeToEvent(BeaconEvent.HIDE_UI, (data) => saveLog(data, BeaconEvent.HIDE_UI));
diff --git a/apps/taquito-test-dapp/src/styles/index.scss b/apps/taquito-test-dapp/src/styles/index.scss
index 88ddc4cdf4..1b7b58122a 100644
--- a/apps/taquito-test-dapp/src/styles/index.scss
+++ b/apps/taquito-test-dapp/src/styles/index.scss
@@ -28,6 +28,7 @@ main {
   position: relative;
   display: grid;
   grid-template-columns: 25% 75%;
+  grid-template-rows: 75% 25%;
   height: 100vh;
   z-index: 10;
 }