Fix delete key and display bug