Update shortcuts to follow convention and add Ctrl for windows users