updated tab order and alt combo shortcut