Minor site fixes
Fix merge conflicts