Updated navigation to be dynamic