js + css refactor