Added and Fixed the ArrayAdapters

See title