Add and improve keyboard shortcuts