Changes to UI and database structure