Fixed a bunch of model ID's and attributes
Merge branch 'master' of https://github.com/ShawLevin/menus