Fixed jquery and Improvement