Switched back to ListView. Added checks and fixes to easily switch between GridView and ListView.
Back to GridView. Hopefully for good.