Refactor.  Now use layout file.