fix page to styling
Merge branch 'master' into deploy