moved upload to modal

Stage one of the upload redesign.