Minor changes to GUI and DB logic.