Fixed some bugs in wizard and added extra form-control buttons