Merge pull request #1 from calebsander/master

Update to origin
Changed upload to not be a dropdown
Some minor style changes