ITCap error checking and button move
Merge branch 'master' of https://github.com/hanlonal/CSE4982013