fixed clickable are aissue on the yukle button
fized merge conflicts I guess...