Make alt-tab detection more reliable
Rearrange options