Fix token url when pagination
Minor view improvements