made city and state fields inline