UI updates
Merged with master