Continued work on new UI design