added icons; added footer
fix merge conflict