Improved homepage
merging stuph