bundle and nav fix