- Fix shortcuts
- Make confirm dialog optional
