Added new UI code
Merged in new UI code from last night