General refactoring & orbits now display properly for all zooms