Database and GUI changes