views and template cooperation changes
views and template cooperation changes