Fix the order of items and update the data
Add new data structure
Minor fixes