Fixed navigation error. Start and end work now