rearranged and fixed some stuff moving towards a navbarNavigationPanel