styling button and footer
merge conflict fix