Reworked some shortcuts.