Redo keyboard navigation code to support WASD as well