Changed more things to haml.removed bootstrap span divs and used mixins