Added links and format