huge ui update
continued ui update
next ui improvements
Merge branch 'ui-update'
ui