Fixes to some of the layouts.