CSS/JS organization cleanup