Refactored Array into own class. Updated UI for app