Get save/discard all buttons working again