updated grid display
fixed conflicts