update website bugfixes
Merge branch 'enhancements'