initial conversion to hyde layout and website updates
Merge branch 'master' into website