Merge branch 'master' into UIChanges
Added more UI Chages
Merge branch 'UIChanges'