changes for role based CP based view