update db layout
use text from i18n, bug fixes