Fixed stop button and added auto switch back to nav