diff --git a/cmd/ui/ui.go b/cmd/ui/ui.go
index 433dd4e..cf836c1 100644
--- a/cmd/ui/ui.go
+++ b/cmd/ui/ui.go
@@ -24,7 +24,7 @@ const (
 	CMD_FINDMNT           = "/usr/bin/findmnt"
 	CMD_VCGENCMD          = "/opt/vc/bin/vcgencmd"
 	FILE_CPU_TEMP         = "/sys/class/thermal/thermal_zone0/temp"
-	ALBUM_ROOT_DIR        = "/tank/pictures"
+	ALBUM_ROOT_DIR        = "/tank/pictures/"
 	SYNCTHING_FOLDER_SKIP = ".stfolder"
 )
 
@@ -88,7 +88,11 @@ func main() {
 			if strings.Contains(path, SYNCTHING_FOLDER_SKIP) {
 				return nil
 			}
-			albums = append(albums, path)
+			albumName := strings.TrimPrefix(path, ALBUM_ROOT_DIR)
+			if albumName == "" {
+				albumName = "Main Folder"
+			}
+			albums = append(albums, albumName)
 		}
 		return nil
 	})
@@ -183,8 +187,9 @@ func main() {
 
 	// Select Albums Form
 	selectAlbumsForm := tview.NewForm()
-	selectAlbumsForm.AddCheckbox("Album 1", false, nil)
-	selectAlbumsForm.AddCheckbox("Album 2", false, nil)
+	for _, album := range albums {
+		selectAlbumsForm.AddCheckbox(album, true, nil)
+	}
 	selectAlbumsForm.AddButton("Apply", nil)
 	selectAlbumsForm.AddButton("Cancel", func() {
 		main.Clear()