Some changes to the forms and added a redirect for toolkit.