Added links and adjusted order