Checkpoint before working on layout