Fix template and layout mapping
Merge branch 'feature/modman_integration' into develop