Override default organization view

This refs affinitic #5903