Added keyboard shortcuts and tooltips