Form refactors, with correct jquery binding behavior