refactoring plan page
UX sync modal
Merge branch 'master' into gh-pages