Pittman merge/UI bugs addressed

Pittman UI bugs fixed
Merge branch 'master' into RSherman_LEX
Merge branch 'RSherman_LEX' of https://github.com/itraycer/iTraycer into jeuvin