Further layout tunings.