.erb to .haml (add)

haml fixes, style fixes