better for footer
made some changes
merge conflict resolved