Improve, and add some more, keyboard shortcuts