Fix links and change optic of modal