more .erb to .haml changes