added album grid view, clean up