New layout and copy
Merge pull request #1 from iHiD/new_layout

New layout and copy