Merge pull request #1 from codehearted/auto-layout-cell-assignment

Suggested changes for Checkpoint 29
Fixed text clipping issue