navi and hero-area fixes