DB migration, layout and clone fixes