Updated normal views and templates