Cleans up the menu classes as per #17
Resolve a merge conflict
update menu classes
Merge pull request #17 from peterwilsoncc/BQ/filter-menu-classes

Filter the menu classes to only to have the following