Fixed buttons (6/18)

Fixed buttons