Add names to NavBarVCs
Fix completion handler logic