Continued work on menu buttons