Prepare for new UI concepts