lots of fixes around album display