final touches on navigation