Revert "Revert "kleine anpassung.... vorallem in form, presenter und sender""

This reverts commit a4e8980915a09067c89546e5a38b4c2b4a666d4a.