diff --git a/instance/main.js b/instance/main.js
index b7315ccc56f12992f72cc759ce1fb97b211e569a..e585d4a5e321b29b4d3d68ce4d72d067cc560821 100644
--- a/instance/main.js
+++ b/instance/main.js
@@ -97,8 +97,8 @@ window.onload = () => {
     addIpcToButton('selectPool', ['select-pool']);
     addIpcToButton('openMdtView', ['select-mdt']);
 
-    addIpcToButton('openKurisu', ['toggle-kurisu']);
-    addIpcToButton('openUserView', ['toggle-client-view']);
+    addIpcToButton('open-kurisu-view', ['toggle-kurisu']);
+    addIpcToButton('open-user-view', ['toggle-client-view']);
 
     ipcRenderer.send('verify-lektord');
     logger.debug('instance', 'Window loaded');
diff --git a/instance/views/menubar.ejs b/instance/views/menubar.ejs
index b62e64c7b7db74428129ca6fc600a205ced284b1..6fad850efcc618c5c960f62706e5db0b46cb3042 100644
--- a/instance/views/menubar.ejs
+++ b/instance/views/menubar.ejs
@@ -17,8 +17,6 @@
     </div>
     <div class="btn-group" role="group"><%- include('menubar/buttons.ejs', {type: 'secondary', buttons: [
         {id: 'btn-settings', tooltip: 'Open settings',                  name: 'cogs'},
-        {id: 'openKurisu',   tooltip: 'Open Kurisu in a new page',      name: 'compass'},
-        {id: 'openUserView', tooltip: 'Open client view in a new page', name: 'user-friends'},
         {id: 'openMdtView',  tooltip: 'Open metadata view',             name: 'music'},
         {id: 'closeButton',  tooltip: 'Quit Amadeus',                   name: 'window-close'},
     ]}); %></div>
diff --git a/instance/views/settings.ejs b/instance/views/settings.ejs
index 226735c508bb1f7400b716f2317eb6640f942d6b..a89a38e07bbde03fe6d0d71d8c67172fe1bf7b2a 100644
--- a/instance/views/settings.ejs
+++ b/instance/views/settings.ejs
@@ -1,13 +1,17 @@
 <%# vim: ts=4 syntax=html
     The template for the settings modal %>
-<div id="modal-settings" class="modal bd-example-modal-lg" tabindex="-1" role="dialog" style="overflow-y: scroll">
+<div id="modal-settings" class="modal bd-example-modal-lg" tabindex="-1" role="dialog" style="overflow-y: scroll; background: #868e96f2;">
     <div class="modal-dialog modal-lg modal-dialog-centered" role="document">
         <div class="modal-content">
             <div class="modal-header">
                 <h2 class="modal-title">Amadeus settings</h2>
-                <button type="button" class="btn btn-outline-primary btn-lg modal-close" aria-label="Close">
-                    <i class="fas fa-window-close"></i>
-                </button>
+                <div class="btn-group">
+                    <%- include('settings/button.ejs', {id: 'open-user-view', name: 'User View'}); %>
+                    <%- include('settings/button.ejs', {id: 'open-kurisu-view', name: 'Kurisu'}); %>
+                    <button type="button" class="btn btn-outline-primary btn-lg modal-close" aria-label="Close">
+                        <i class="fas fa-window-close"></i>
+                    </button>
+                </div>
             </div>
             <div class="modal-body">
                 <form>
diff --git a/instance/views/settings/button.ejs b/instance/views/settings/button.ejs
new file mode 100644
index 0000000000000000000000000000000000000000..ccbc320f848d843173d7be45864bccfaf80f91e3
--- /dev/null
+++ b/instance/views/settings/button.ejs
@@ -0,0 +1,3 @@
+<%# vim: ts=4 syntax=html
+    The template for a button %>
+<button type="button" class="btn btn-outline-secondary text-light btn-sm" style="border: 0px;" id="<%= id %>"><%= name %></button>