More changes to layouts.