Change order of target fields and make password a password field