Fix button click bindings so there accepted by the form designer and don't get lost again