Code formatting and bug fix

When you go from one textfield to another the cursor on the first
textfield didn't disappear