Style Changes
Enhance JS Implementation