Updated navigation to work correctly