- Updated layout control