Transferred changes from f81fac to scss