Bezier cleanup
Button cleanup