fixed indenting, moved haml to /views