Layouts support units

Units, units, units :-)