Cleaner Interface for additional forms

[bengolder]

Edit upload page to only put in the forms needed, and to be able to add forms