diff --git a/js/components/Character.js b/js/components/Character.js
index 0c29f416..bb853b79 100644
--- a/js/components/Character.js
+++ b/js/components/Character.js
@@ -10,7 +10,7 @@ export const characterClassName = char =>
 const Character = ({ children: char, className, ...passThrough }) => (
   <div
     {...passThrough}
-    className={`${className} character ${characterClassName(char)}`}
+    className={`${className || ""} character ${characterClassName(char)}`}
   >
     {char}
   </div>
diff --git a/js/components/MainWindow/__snapshots__/index.test.js.snap b/js/components/MainWindow/__snapshots__/index.test.js.snap
index ccc5af08..5a196883 100644
--- a/js/components/MainWindow/__snapshots__/index.test.js.snap
+++ b/js/components/MainWindow/__snapshots__/index.test.js.snap
@@ -112,42 +112,6 @@ exports[`MainWindow renders to snapshot 1`] = `
         </ul>
       </div>
     </div>
-    <div
-      className="countdown"
-      id="shade-time"
-      onClick={[Function]}
-    >
-      <div
-        className="character character-NaN"
-        id="shade-minus-sign"
-      >
-        
-      </div>
-      <div
-        className="character character-48"
-        id="shade-minute-first-digit"
-      >
-        0
-      </div>
-      <div
-        className="character character-48"
-        id="shade-minute-second-digit"
-      >
-        0
-      </div>
-      <div
-        className="character character-48"
-        id="shade-second-first-digit"
-      >
-        0
-      </div>
-      <div
-        className="character character-48"
-        id="shade-second-second-digit"
-      >
-        0
-      </div>
-    </div>
     <div
       id="minimize"
     />
@@ -241,68 +205,57 @@ exports[`MainWindow renders to snapshot 1`] = `
         }
       >
         <div
-          className="character character-119"
-          id={undefined}
+          className=" character character-119"
         >
           W
         </div>
         <div
-          className="character character-105"
-          id={undefined}
+          className=" character character-105"
         >
           i
         </div>
         <div
-          className="character character-110"
-          id={undefined}
+          className=" character character-110"
         >
           n
         </div>
         <div
-          className="character character-97"
-          id={undefined}
+          className=" character character-97"
         >
           a
         </div>
         <div
-          className="character character-109"
-          id={undefined}
+          className=" character character-109"
         >
           m
         </div>
         <div
-          className="character character-112"
-          id={undefined}
+          className=" character character-112"
         >
           p
         </div>
         <div
-          className="character character-32"
-          id={undefined}
+          className=" character character-32"
         >
            
         </div>
         <div
-          className="character character-50"
-          id={undefined}
+          className=" character character-50"
         >
           2
         </div>
         <div
-          className="character character-46"
-          id={undefined}
+          className=" character character-46"
         >
           .
         </div>
         <div
-          className="character character-57"
-          id={undefined}
+          className=" character character-57"
         >
           9
         </div>
         <div
-          className="character character-49"
-          id={undefined}
+          className=" character character-49"
         >
           1
         </div>
@@ -313,26 +266,22 @@ exports[`MainWindow renders to snapshot 1`] = `
       id="kbps"
     >
       <div
-        className="character character-110"
-        id={undefined}
+        className=" character character-110"
       >
         n
       </div>
       <div
-        className="character character-117"
-        id={undefined}
+        className=" character character-117"
       >
         u
       </div>
       <div
-        className="character character-108"
-        id={undefined}
+        className=" character character-108"
       >
         l
       </div>
       <div
-        className="character character-108"
-        id={undefined}
+        className=" character character-108"
       >
         l
       </div>
@@ -342,26 +291,22 @@ exports[`MainWindow renders to snapshot 1`] = `
       id="khz"
     >
       <div
-        className="character character-110"
-        id={undefined}
+        className=" character character-110"
       >
         n
       </div>
       <div
-        className="character character-117"
-        id={undefined}
+        className=" character character-117"
       >
         u
       </div>
       <div
-        className="character character-108"
-        id={undefined}
+        className=" character character-108"
       >
         l
       </div>
       <div
-        className="character character-108"
-        id={undefined}
+        className=" character character-108"
       >
         l
       </div>
diff --git a/js/components/PlaylistWindow/__snapshots__/index.test.js.snap b/js/components/PlaylistWindow/__snapshots__/index.test.js.snap
index c838200f..e216b457 100644
--- a/js/components/PlaylistWindow/__snapshots__/index.test.js.snap
+++ b/js/components/PlaylistWindow/__snapshots__/index.test.js.snap
@@ -4,6 +4,7 @@ exports[`PlaylistWindow renders to snapshot 1`] = `
 <div
   className="window draggable"
   id="playlist-window"
+  onMouseDown={[Function]}
   style={
     Object {
       "backgroundColor": undefined,
@@ -48,7 +49,34 @@ exports[`PlaylistWindow renders to snapshot 1`] = `
         />
         <div
           className="playlist-bottom-right"
-        />
+        >
+          <div
+            className="playlist-action-buttons"
+          >
+            <div
+              className="playlist-previous-button"
+            />
+            <div
+              className="playlist-play-button"
+              onClick={[Function]}
+            />
+            <div
+              className="playlist-pause-button"
+              onClick={[Function]}
+            />
+            <div
+              className="playlist-stop-button"
+              onClick={[Function]}
+            />
+            <div
+              className="playlist-next-butto"
+            />
+            <div
+              className="playlist-eject-button"
+              onClick={[Function]}
+            />
+          </div>
+        </div>
       </div>
     </div>
   </div>