Improved layouts.