Layout management
Resolved layout conflict