Small fixes in layouts.