improve household form fields layout