Fixed Some Issues with the New Margins