Small changes to new UI System