Converted some stuff to haml