UI fixes and logging