Mainly fixes for displaying collections shared with groups

- fixes for displaying collections shared with groups
- some minor fixes
- little code cleanup