Fixed bug and correct text related to native components