Update layout and form, correct DB so that City is recorded