Implemented a smoother navigation