Fixed - Grid is drawn correctly now