Updated the URL's + the code that works with them & parses the page
accordingly.

Change-Id: Iba1414c749bdf227b3945162da83e3d35ce86244