Tiny UI fixes for overlap and text