Updated links & margins