Some more UI changes

to make things a bit simpler