Tidied up layouts and views to make sure backup plan works when needed
Checking in before experimenting with ordered_items
FINALLY got nested ordered_items to work
Added Update/Destroy methods to OrderedItems, cleaned up some tables
Updating Master branch to reflect branch changes
Fix minor error
Merged with master and dylan