updated database and UI

Final commit before project submission