Consider revising the cross section of soil improvement layers, by specifying a single well graded granular fill layer of 400 mm depth, with stone sizes of preferrably 50-200 mm size, instead of two layers of granular fill.