diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs
index f2b3dabf..14776c68 100644
--- a/src/renderer/views/main.ejs
+++ b/src/renderer/views/main.ejs
@@ -517,7 +517,7 @@
 
                 </div>
                 <transition name="drawertransition">
-                    <div class="app-drawer" v-if="drawer.open">
+                    <div class="app-drawer" v-if="drawer.open && drawer.panel == 'lyrics'">
                         <div class="bgArtworkMaterial">
                             <div class="bg-artwork-container">
                                 <img class="bg-artwork a" :src="$store.state.artwork.playerLCD">
@@ -531,6 +531,10 @@
                                 "Default View":'Fullscreen View'}}
                             </button>
                         </div>
+                    </div>
+                </transition>
+                <transition name="drawertransition">
+                    <div class="app-drawer" v-if="drawer.open && drawer.panel == 'queue'">
                         <cider-queue ref="queue" v-if="drawer.panel == 'queue'"></cider-queue>
                     </div>
                 </transition>
diff --git a/src/renderer/views/pages/cider-playlist.ejs b/src/renderer/views/pages/cider-playlist.ejs
index d8dc2705..fd6a4393 100644
--- a/src/renderer/views/pages/cider-playlist.ejs
+++ b/src/renderer/views/pages/cider-playlist.ejs
@@ -58,19 +58,19 @@
                         </div>
                     </template>
                     <div class="playlist-controls">
-                        <button class="wr-btn" style="min-width: 120px;"
+                        <button class="md-btn" style="min-width: 120px;"
                                 @click="app.mk.shuffleMode = 0; play()">
                             Play
                         </button>
-                        <button class="wr-btn" style="min-width: 120px;"
+                        <button class="md-btn" style="min-width: 120px;"
                                 @click="app.mk.shuffleMode = 1;play()">
                             Shuffle
                         </button>
-                        <button class="wr-btn" style="min-width: 120px;" v-if="inLibrary!=null && confirm!=true"
+                        <button class="md-btn" style="min-width: 120px;" v-if="inLibrary!=null && confirm!=true"
                                 @click="confirmButton()">
                             {{ (!inLibrary) ? "Add to Library" : "Remove from Library" }}
                         </button>
-                        <button class="wr-btn" style="min-width: 120px;" v-if="confirm==true"
+                        <button class="md-btn" style="min-width: 120px;" v-if="confirm==true"
                                 @click="(!inLibrary) ? addToLibrary(data.attributes.playParams.id.toString()) : removeFromLibrary(data.attributes.playParams.id.toString()) ">
                             Confirm?
                         </button>