More JS & CSS cleanup