New layout
Fix for omission in new layout code
Merge pull request #338 from smorloc/master

New layout