remap tab & window nav, some tidying