Change order and add URLs