Changed selectors, refactored chaching of jQuery objects