Refactored class names and added js (still useless)