Add missing data
Add icons to make it purdy