Improve navbar structure