making upload view more intuitive
fixing last changes
Merge pull request #86 from andrewjadams3/upload

Upload