Build 1.2.5 - Reorganizing layout and canvas modules