Added links and type tag