Tidied up the week view