frontend: tidied up views and templates