Move navigation events into behavior