Added zipcode handling, minor UI changes