updated js + scss