Little improvements on layout panel