fix links and reorder