Fixed buttons (17/18)

Fixed buttons