Pages fixes
Merge branch 'shop' of github.com:hackazon/hackazon into shop