Adding keyboard shortcuts, refactoring.