updated ordering and fixed broken urls