PR for code review

Changed all of the AutoComplete to EditText Widgets