modal update for preferences in progres
Merge branch 'refactor/modal'