refactored templates a little bit, added address verification too