Views and templates modified