Fixed Grid sizing
Updated import versions
Appended ListItem where necessary to avoid confusion with other sdk elements
Merge branch 'fix-grid' into develop