Updated to new UI stuff