Trying to combine menus under 1 method
code cleanup