fix project page jumping issue
fix project page jumping issue + merge conflicts