Fixed Broken breakpoints and navigation