Small change in layout management