Merged in TheCosmotect's arrow navigation pull request