gave all cancel buttons the cancel text again, also refactored the loading buttons
Merge branch 'master' of https://github.com/Fingerpaint/project-code