Added new layout file with tidied code.