Miscellaneous UI fixes / bug fixes