refactoring OrgsView and template