Lots of bug fixed on homepage