converted more ERB to Haml