Various UI changes

0 0

Various UI changes