Fix highlight and add save alert