Continued work on MenuLayout