Continued work on menu