Added zip code validation
Lots of small tweaks

Need to fix header