UI updates
Merge remote-tracking branch 'origin/master'
alomst complete
updates