First conversion to haml, all pages working
Append to last commit