More wrappers

Now less code in the Form Eventhandlers. Moved it to seperate files.