Fixed buttons (8/18)

Fixed buttons