more efficient javascript / updated some SCSS