Fix button position
Finish 2.4.7