Updated layout manager