Fixed a couple of UI glitches