Navigation still not working well