Ui and Ux Modifications
Merge pull request #1 from mclaughlinmax/master

Ui and Ux Modifications