Updated links and html