CON-1016 | Make some progress on GlobalNav