Added some stuff to the views and templates