UI clean up
Merge branch 'UI'
ui clean up