more buttons added. connection to mediator established
fixed merge error