Refactor NavbarHorizontal::buildNavBarComponents

Change-Id: I24e669a0c64e57cdbe5344e549696f284e8b35d8