got rid of footer
add strong tags on name
fix conflicts