Reorganized with the addition of jquery link