Tidied up views and scripts