Fixed a few more UI issues and bugs