migration fixes and tweak of setting view