Add grid and Spotify views
Improve layout
Fix line trimming