UI fixes and etc.