footer
clean up css
bug in merge
bug fix