Updated templates & corresponding views