adjusted the forms and updated button