Album overhaul bug fixes