Changed to ArrayAdapter; fixed formatting
Changed to ArrayAdapter; fixed formatting
merge