added text-fields, email functionality, cleaned up object arrangement