Add content to roles relationship, fine-tune nav objects