Even more improvements for the layout file