Fix UI layout
Merge branch 'master' of github.com:brti/software-engineering
Fix UI layout