More improvements on layout display.