Simplify switching to playlist view
Merge branch 'feature/view'