diff --git a/src/main/resources/sbu/javafx/App-view.fxml b/src/main/resources/sbu/javafx/App-view.fxml
index 306c8d3..279b776 100644
--- a/src/main/resources/sbu/javafx/App-view.fxml
+++ b/src/main/resources/sbu/javafx/App-view.fxml
@@ -1,8 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.scene.layout.VBox?>
-<VBox xmlns="http://javafx.com/fxml" alignment="CENTER" spacing="10">
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.control.Button?>
+<?import javafx.geometry.Insets?>
 
-    <!-- TODO: Add your code here! -->
+<VBox xmlns:fx="http://javafx.com/fxml" alignment="CENTER" spacing="10" fx:controller="sbu.javafx.MusicController">
+    <padding><Insets right="30" left="30" bottom="20"/></padding>
+
+    <Label text="Music Player" styleClass="title"/>
+
+    <VBox styleClass="box" spacing="10">
+        <padding><Insets top="10" right="10" bottom="10" left="10"/></padding>
+        <TableView fx:id="songsTable" prefHeight="420">
+            <columns>
+                <TableColumn fx:id="titleCol" text="Song Title" prefWidth="220"/>
+                <TableColumn fx:id="artistCol" text="Artist Name" prefWidth="220"/>
+                <TableColumn fx:id="durationCol" text="Duration" prefWidth="120"/>
+                <TableColumn fx:id="addCol" text="Add to Playlist" prefWidth="200"/>
+                <TableColumn fx:id="playCol" text="Play" prefWidth="120"/>
+            </columns>
+        </TableView>
+    </VBox>
+
+    <HBox styleClass="box" spacing="10" alignment="CENTER_LEFT">
+        <padding><Insets top="16" right="16" bottom="16" left="16"/></padding>
+        <Label text="Now Playing: " />
+        <Label fx:id="nowPlayingLabel" text="-"/>
+        <Pane HBox.hgrow="ALWAYS"/>
+        <Button fx:id="playListButton" text="Open Playlist" onAction="#openPlaylistWindow"/>
+    </HBox>
 
 </VBox>