Drupal Navbar Fork/Testing fixes