Refactoring on @ohadlevy's branch orgs-refactor
DRY locs/orgs controller and views