Remove infield label, add password icon, fix layout