Navigation & improved import