Cleanup, add some keyboard shortcuts