made a bunch of fixes to have plug work in logic
few fixes here and there, not stable. Before adding buttons for comboboxes
added buttons and seems like it's working