UI fixes / changes
Merged from upstream/config