Ux changes

New pull request after renaming branch