fixed issues with EditText