Modified 2 of 3 main menus. Fixes #31