Replaced drag and drop with add btn
Fixed problem with genereated method names