adding recover UI & updated some todos