refactored buttons back to wizard wrapper