Updated data model
Added some features to the menu
Added selection in menu
Merge pull request #2 from cfeher/chris-feher

Chris feher