Minor refactoring of Planar Layout