Form updates.  Still need to apply changes across other image submission pages and add secondary image upload pages.
Merged with Max's content updates