adding a lot of refinement to the scss and the js