ENHANCE: Converted main view to use a ListView with correct ListAdapter