More work on Organization views and other minor fixes