Added layout and modified files to use it.