Navigation fixes take #2