change to haml template
various changes