Fixing merge from dev
Refactored gridView's array to match architecture