- Bug fixes with Enter button