Improved top navbar structure