Revert websites to latest spec
Merge pull request #573 from andrerod/dev

Revert websites to latest spec