PShrestha's: Final change set for the Contact Viewer ap