Added keyboard shortcuts
Still keyboard shortcut bugs