MenuOptions Refactor

Removed Recursion - See Changelog