(Menu) Cleanups/cut down on code duplication