Updated the UI and moved to full DB