Fixed a bug in callback generator + added new button :)