Adding changes for UserProfileList and some fixes