Conflict keuzes gemaakt
Merge branch 'feature/view_usability_fixes' into develop