Feature/design updates

Merged Timo Koch requested to merge feature/design-updates into master

Merge request reports