rearrangeed some scss and simplified