Fixing and Adding various links