Added keyboard shortcuts - working