code style & UI fixes