Database and UI improvements