Re-add navigator breadcrumb; Update TODO