Cleaned up quitting navigation