Added tabbing for all the fields. Removed some commented out code