Tidy up
Including csrf tags