UI work
Fix UI glitches