Fix some codes and Add Entry Event when press Enter key