Further database and UI modifications