2 small changes before merging attempt
made xml-types, improvements in Layout