sync essentials
path fixes
page css
fix merge conflict