Minor UI fixes to avoid flickering