Build related parts for new UI

Why comment out instead of remove?