Reorganized the forms. Minimize the amount of code drupal bootstraps