UI fixes and tooltip improvements