form cleanup
minor html changes