First clean up, make the main view and upload view combined...