Updates to menu items and menus to actually work