Fix pages errors
Merge branch 'master' of github.com:khcr/way