more UI glitch fixes