finalizing the infrastructure for new UI