UI changes, Upload fixes