Fixed buttons (9/18)

Fixed buttons