Fixed bugs in the form and added a new button element