Refactored menu helper methods, moved to own helper