Updated lots of views and templates