Updated owner, contributor, viewer gallery logic
merged conflicts