cleaned up code, created two separate forms instead of one long form