Updated layout managment