Updated cancel for wizards and added AttributesEmpty concern