Updates to Upload

Need to finish off, change the way file upload is working then save
resources, most of the screens are in place.