Layout fix for D&P