More menu fixes