Merge pull request #31 from grizzly-studios/f_menu_restructure

F menu restructure
"fix" the compile problem
Revert ""fix" the compile problem"

This reverts commit dbebdcca4608e2d6a17848ba76078790c6400e26.
Added missing event enum strings