Updated Selectors

Improved CSS Selectors, Eliminated use of indexOf.