Fix navigation layout in firefox and chrome

Hover css still broken

refs #7736
Badge: Fix FF display bug

refs #7736
Merge remote-tracking branch 'origin/master' into bugfix/broken-badges-7736
Merge branch 'bugfix/broken-badges-7736'

fixes #7736