fixed issue with single layout option
Merge branch 'layout-selector' into photocopy