fixed url params, added links and reordered