changed some names to allow scrolling navbar to work again