Refactored header and footer
Updated footer