Fixes #8397: better navbar padding with grid gutter stuff