Clean up and fix footer