Moving Websites client changes to master

This PR includes the work done to update the Websites client based on the most recent spec changes.