fix merge conflict for navbar-header/navbar-white
updated styles for groupsheet display with new theme, bootstrap3; [Fixes #54044307]