Unique fix, role view fix, bug fixes