changed views and templates