Feat/upload form layout

Please switch this back to /upload