some fixes
buttons titles