Fix specs and move to the edge haml