Rebased patch to new UI

Rebased patch to new UI