Added the basic structure for the new UI