Moving code from Layout into Mosaic.
Clean up Filling and gap