Implemented discoverpage and edittrivio. Did also change some bugs in the layout.

added 6 commits

• 3487ddd6...30afc323 - 5 commits from branch master
• 81469f72 - Merge branch 'master' into 'edittrivio'

Compare with previous version

mentioned in commit 6008e0a2

merged