Rebuilding navbar markup for better layout