Started integrate new navbar