Major fixes in all site