Committing UI updates to master

UI updates