Fixed disabled buttons
several intermediate changes