Cleaned up some of the new UI stuff