Modified layouts to conform to DSA