Change XPath to account for page structure changes