Move OnClickListners for some buttons. Change ID for EditText view