added better wrapping elements to the password field