Keyboard nav mostly complete