Keyboard improvments (works with arrow keys)