-Refatoring flow layout