Fixed up organization views
Merged and fixed merge conlicts with organization views