Layout and UI improvements
Merge branch 'master' of github.com:CDE-UNIBE/sca-webapp