Fixed db settings
Cleaning up the UI