Bug fixes for switching to/from orbit view