Improved nav a bit