changes to fix issues with using different languages against templates and layout directories
AllTheAction pull request approved