Improve flexibility in layout
