added guard & improved layout file
new stuff