Updated menu to work with new schema
Merged the new db stuff