Moved unit lists from grid view to collection view