Tidied up and added google analytics