Adding some fixes to site