Changed to EditText for expression and result