Ui work

Merge UI work with master