Fixing layout system, adding license