refactored the scss and markup