Improved JS

Improved JS and class ID layout