Tidied up the code and the menu itself.