Bug fixes and prevent duplicate numbers when tapping