minor modify for layout change