Fix navigating to systems