Fix highlight node & Add pop-up to beautify user experience