Updated layout of unit generator