Some clean up.
New custom ArrayAdapter class. Now displays an icon next to each entry.