added hidden fields and cleaned up forms