Add close btns to modal footers for better UX
Merge branch 'master' into gh-pages