Small changes to the new UI system