Fixed a few UI bugs