Improved main page some more