navbar callouts cleanup

Move all callouts to be adjacent to each other
Combine JS-related callouts into a single callout