Refactor navbars to simplify things

BS3 commit ba8026e00f85f76e88a4005162612a7568a0a405
run build