UI modifications
Merge branch 'UI'