Fixes and css
Merge branch 'master' of https://github.com/VerenaVertonghen/know-brainer
Merge branch 'master' of https://github.com/VerenaVertonghen/know-brainer
Final commit
Fixed conflict