various files: UI fixes