Changed rest of old .erb files to .haml
Tweak confirmation pages, links and wording