clean code up , modify main and footer