Layout updates and reorganization