database and form reorganize