SCIPAD-1681 Changes to make the navigation bar items work in a more standard fashion