Tidied up layout and content