Fix parsing bug for numbers
Slightly change key combo display