final commit for the ui
Merge branch 'feature/ui'