Improved layouts with single session checking.