Navigation helper + minor changes in vehicles