Add fixes to layouts.