Corrected layout file structure