Consistent theme across General/Commander page
Merge branch 'develop' of https://github.com/cjimison/barrage into develop