Grid consistency, fix annotation horizontal rule
Merge branch 'master' of github.com:nprapps/civilrights