Changes to GUI and database