Feature/convert to haml