More work on Organization views and made other minor fixes