#5 Reverted non contiguous layout because of poor editing performance.