Fixed a bunch of UI issues and bugs