Added keyboard shortcuts, closes #28