Added navBarMenu and tweaked menu rendering behaviour