more changes to the views and templates