Various UI updates

0 0

Various UI updates