converted most html to haml
changed most html to haml