fixed up some buttons
about to refactor uploading n such
Merge branch 'develop' of https://github.com/ARISGames/iOSClient into develop