Added links and redirect