Carried out a bit of refactoring in the orgs controller
All view specs passing for scrolling