Added the updated data_viewer