Attempt to fix weirdness on navigation in smaller windows