Fix the password field (FWIW)
revert "layout tweaks"

This reverts commit 919b7a777110d26e0898be81b9f515fad0ee1b9f.