improved nav with magic