cleaning up project and added EditText Fields