Cleaned up code, view is synced to new music