Tidied up menu