grid fixes. No more JS needed