db changed and ui refined