aligned wizard to new fieldgroup design