Improve UX and correct keyboard