refactoring

menumodel refactoring to for transfer to 5.1
Revert "refactoring"

This reverts commit 917e3ecac36ef5af56cae5529c93c6028774af37.
menu model after John's comments

prepping for 5.1 upgrade