Add annotation to roles list and changed title for user list