more nav menu fixes