almoust integrate new navbar