main site fix
Merge branch 'fixes'