Added layout management.