Fixed single page layout of organizations
Merge branch 'templating'