Fixed a lotof stuff on the site