NavigationMenu Fixes + other