Optimized JS and new active classes