Improved Organizations Controller

Improved Organizations Controller