More work on navbars