Nav toolbar enhancements

Some minor fixes