1. db rename
2. ui fixes