Tidied up view files