More eidts to the views and templates.