adopt grid 4 + 8 layout, cleanup