Moved the layout file to reduce possibility of conflicts