diff --git a/ui/app.go b/ui/app.go
index 80b3225..2a3909b 100644
--- a/ui/app.go
+++ b/ui/app.go
@@ -157,7 +157,7 @@ func NewApplication() *tview.Application {
 			return nil
 		}, progressBar),
 		"choose_device": NewAction(func(e *tcell.EventKey) *tcell.EventKey {
-			OpenDeviceMenu()
+			openDeviceMenu()
 			return nil
 		}, nil),
 		"focus_nav": NewAction(func(e *tcell.EventKey) *tcell.EventKey {
diff --git a/ui/device.go b/ui/device.go
deleted file mode 100644
index 37852b5..0000000
--- a/ui/device.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package ui
-
-import "github.com/aditya-K2/gspt/spt"
-
-func OpenDeviceMenu() {
-	m := NewMenu()
-	cc := []string{}
-	// TODO: Better Error Handling
-	devices, err := spt.UserDevices()
-	if err != nil {
-		SendNotification(err.Error())
-		return
-	}
-	for _, v := range devices {
-		cc = append(cc, v.Name)
-	}
-	m.Content(cc)
-	m.Title("Choose A Device")
-	m.SetSelectionHandler(func(s int) {
-		if err := spt.TransferPlayback(devices[s].ID); err != nil {
-			SendNotification(err.Error())
-		} else {
-			RefreshProgress(true)
-		}
-	})
-	root.AddCenteredWidget(m)
-}
diff --git a/ui/utils.go b/ui/utils.go
index bff8f13..e61a5ce 100644
--- a/ui/utils.go
+++ b/ui/utils.go
@@ -32,6 +32,30 @@ func openPlaylistMenu(handler func(playlistId spotify.SimplePlaylist)) {
 	root.AddCenteredWidget(c)
 }
 
+func openDeviceMenu() {
+	m := NewMenu()
+	cc := []string{}
+	// TODO: Better Error Handling
+	devices, err := spt.UserDevices()
+	if err != nil {
+		SendNotification(err.Error())
+		return
+	}
+	for _, v := range devices {
+		cc = append(cc, v.Name)
+	}
+	m.Content(cc)
+	m.Title("Choose A Device")
+	m.SetSelectionHandler(func(s int) {
+		if err := spt.TransferPlayback(devices[s].ID); err != nil {
+			SendNotification(err.Error())
+		} else {
+			RefreshProgress(true)
+		}
+	})
+	root.AddCenteredWidget(m)
+}
+
 func addToPlaylist(tracks []spotify.ID) {
 	openPlaylistMenu(func(sp spotify.SimplePlaylist) {
 		aerr := spt.AddTracksToPlaylist(sp.ID, tracks...)