More UI changes

More UI changes