updated layout selector to be a radio
fixed issue with single layout option
Merge branch 'layout-selector'