More changes to main and footer