fixed other button
Merge branch 'weirdbuttons'