Moving some more JS into the right places, and SCSS