#836 Update navbar to new style