Added new UI from Kasun