commit slight changes
Fixed grid bugs for vertical
Merge branch 'feature_grid' into development