More work on album view (WIP)