Combine repeated menu setup functionality

William Henry Taylorrequested to merge
witaylor/athena:menu_setup_refactoring into master

Small refactoring of menu setup functions to remove duplicated code.

Merge request reports