Persistent history and overlap for grid / arrow keys
Merge branch 'persistent-history'

* persistent-history:
  Persistent history and overlap for grid / arrow keys