More updates and testing with navigation links