some button changed, ajusted