Fixed up Tools toolstrip on BOMB and CUPE
Merge branch 'master' of https://github.com/hanlonal/CSE4982013