Use link_to helpers in place of haml anchors
Markup cleanup
Convert erb view to haml