Updated navigation with better links