Further enhancement for the flow layout.