Deleted old templates
Improved all templates as generic views
Merge branch 'feature/generic_views_2' into develop