Rearranged the add forms to fix a bug with duplicate form submissions