Some menu interaction improvements

2 jobs for 64-improve-menu-structure in 8 minutes and 50 seconds (queued for 3 seconds)