Update key maps for tab managment, fix PWD key map