changed default layout strategy to basic layout instead of no layout
added handling for explicit no layout setting, preserved basic layout default