More fixes to CiviCRM navbar margins