Fixing some minor UI glitches