Cleanup of the upload process, tidy up the styling