Shortcuts, 2 New buttons, bug fixes