Merge branch 'UIChanges'
Added new UI
Merge branch 'master' into UIChanges