Added more keyboard shortcuts