Layout improvement
merge